From 399f581855132f7e6d686c1b1f697c6db568a165 Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Wed, 3 Sep 2025 09:08:06 +0300 Subject: [PATCH] Provisioning: bump Android sdkBuildToolsVersion and sdkApiLevel to 36 This patch bumps: -The sdkBuildToolsVersion used in Coin to 36.0.0 -The sdkApiLevel used in Coin to 36 Task-number: QTBUG-138550 Task-number: QTBUG-138549 Pick-to: 6.10 6.8 Change-Id: Ic63cd28ba39743e517ea3a3e2f9ec08bd5dc3267 Reviewed-by: Jukka Jokiniva (cherry picked from commit 2795f20a4e8321ae3cf6e816e9e17aa1db0a20e0) Reviewed-by: Assam Boudjelthia --- coin/provisioning/common/linux/android_linux.sh | 4 ++-- coin/provisioning/common/macos/android.sh | 4 ++-- coin/provisioning/common/windows/android.ps1 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 4d7d88f6..270f4e54 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -25,8 +25,8 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android" toolsVersion="19.0" toolsFile="commandlinetools-linux-13114758_latest.zip" toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile" -sdkBuildToolsVersion="35.0.1" -sdkApiLevel="android-35" +sdkBuildToolsVersion="36.0.0" +sdkApiLevel="android-36" toolsSha1="5fdcc763663eefb86a5b8879697aa6088b041e70" ndkVersionLatest="r27c" diff --git a/coin/provisioning/common/macos/android.sh b/coin/provisioning/common/macos/android.sh index f9f2bf6b..cb018dda 100755 --- a/coin/provisioning/common/macos/android.sh +++ b/coin/provisioning/common/macos/android.sh @@ -25,8 +25,8 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android" toolsVersion="19.0" toolsFile="commandlinetools-mac-13114758_latest.zip" toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile" -sdkBuildToolsVersion="35.0.1" -sdkApiLevel="android-35" +sdkBuildToolsVersion="36.0.0" +sdkApiLevel="android-36" toolsSha1="c3e06a1959762e89167d1cbaa988605f6f7c1d24" ndkVersionLatest="r27c" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 72d25def..7e69eb18 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -41,8 +41,8 @@ $ndkOfficialUrlNightly2 = "https://dl.google.com/android/repository/android-ndk- $toolsVersion = "19.0" $toolsFile = "commandlinetools-win-13114758_latest.zip" $sdkApi = "ANDROID_API_VERSION" -$sdkApiLevel = "android-35" -$sdkBuildToolsVersion = "35.0.1" +$sdkApiLevel = "android-36" +$sdkBuildToolsVersion = "36.0.0" $toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile" $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile" $toolsChecksum = "54a582f3bf73e04253602f2d1c80bd5868aac115"