diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index cf3590ce..b1560186 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -26,8 +26,8 @@ toolsVersion="2.1" toolsFile="commandlinetools-linux-6609375_latest.zip" ndkVersionLatest="r25b" ndkVersionDefault=$ndkVersionLatest -sdkBuildToolsVersion="33.0.1" -sdkApiLevel="android-33" +sdkBuildToolsVersion="34.0.0" +sdkApiLevel="android-34" toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb" diff --git a/coin/provisioning/common/macos/android.sh b/coin/provisioning/common/macos/android.sh index cf47bd99..2e237c75 100755 --- a/coin/provisioning/common/macos/android.sh +++ b/coin/provisioning/common/macos/android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersionLatest="r25b" ndkVersionDefault="$ndkVersionLatest" -sdkBuildToolsVersion="33.0.1" +sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-33" +sdkApiLevel="android-34" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index fca296ca..845e9e14 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -26,8 +26,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk.zip" $toolsVersion = "2.1" $toolsFile = "commandlinetools-win-6609375_latest.zip" $sdkApi = "ANDROID_API_VERSION" -$sdkApiLevel = "android-33" -$sdkBuildToolsVersion = "33.0.1" +$sdkApiLevel = "android-34" +$sdkBuildToolsVersion = "34.0.0" $toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile" $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile" $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208" diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh index 261b8d07..14e5322b 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="33.0.1" +sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-33" +sdkApiLevel="android-34" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-11-arm/30-android.sh b/coin/provisioning/qtci-macos-11-arm/30-android.sh index 261b8d07..14e5322b 100755 --- a/coin/provisioning/qtci-macos-11-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-11-arm/30-android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="33.0.1" +sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-33" +sdkApiLevel="android-34" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-11-x86_64/30-android.sh b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh index 261b8d07..14e5322b 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="33.0.1" +sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-33" +sdkApiLevel="android-34" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-12-arm/30-android.sh b/coin/provisioning/qtci-macos-12-arm/30-android.sh index 6bb9c052..17dc2d66 100755 --- a/coin/provisioning/qtci-macos-12-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-12-arm/30-android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="33.0.1" +sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-33" +sdkApiLevel="android-34" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-13-arm/30-android.sh b/coin/provisioning/qtci-macos-13-arm/30-android.sh index 6bb9c052..17dc2d66 100755 --- a/coin/provisioning/qtci-macos-13-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-13-arm/30-android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="33.0.1" +sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-33" +sdkApiLevel="android-34" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-14-arm/30-android.sh b/coin/provisioning/qtci-macos-14-arm/30-android.sh index 6bb9c052..17dc2d66 100755 --- a/coin/provisioning/qtci-macos-14-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-14-arm/30-android.sh @@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="33.0.1" +sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-33" +sdkApiLevel="android-34" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile"