From 8abebe23ef182c9b3eed28078074202abf49dd3a Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 17 Jan 2023 12:37:26 +0200 Subject: Coin: bump Android platform sdk and build tools version to 33 Use latest platform and build tools to be able to build for Android 13. Pick-to: 6.5 Change-Id: I00bd9948f528d398d471e91de1d22954d786be29 Reviewed-by: Juha Vuolle Reviewed-by: Alexandru Croitor --- coin/provisioning/common/linux/android_linux.sh | 4 ++-- coin/provisioning/common/macos/android.sh | 4 ++-- coin/provisioning/common/windows/android.ps1 | 4 ++-- coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh | 4 ++-- coin/provisioning/qtci-macos-11-arm/30-android.sh | 4 ++-- coin/provisioning/qtci-macos-11-x86_64/30-android.sh | 4 ++-- coin/provisioning/qtci-macos-12-arm/30-android.sh | 4 ++-- coin/provisioning/qtci-macos-13-arm/30-android.sh | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index dba2a62a..79627f0f 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -63,8 +63,8 @@ toolsVersion="2.1" toolsFile="commandlinetools-linux-6609375_latest.zip" ndkVersionLatest="r25b" ndkVersionDefault=$ndkVersionLatest -sdkBuildToolsVersion="31.0.0" -sdkApiLevel="android-31" +sdkBuildToolsVersion="33.0.1" +sdkApiLevel="android-33" toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb" diff --git a/coin/provisioning/common/macos/android.sh b/coin/provisioning/common/macos/android.sh index cef1aee5..de5c86b7 100755 --- a/coin/provisioning/common/macos/android.sh +++ b/coin/provisioning/common/macos/android.sh @@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersionLatest="r25b" ndkVersionDefault="$ndkVersionLatest" -sdkBuildToolsVersion="31.0.0" +sdkBuildToolsVersion="33.0.1" # this is compile sdk version -sdkApiLevel="android-31" +sdkApiLevel="android-33" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index baeb6f1b..532d0d2d 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -62,8 +62,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk.zip" $toolsVersion = "2.1" $toolsFile = "commandlinetools-win-6609375_latest.zip" $sdkApi = "ANDROID_API_VERSION" -$sdkApiLevel = "android-31" -$sdkBuildToolsVersion = "31.0.0" +$sdkApiLevel = "android-33" +$sdkBuildToolsVersion = "33.0.1" $toolsCachedUrl= "\\ci-files01-hki.intra.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 a73fa364..4a49fd3f 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 @@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="31.0.0" +sdkBuildToolsVersion="33.0.1" # this is compile sdk version -sdkApiLevel="android-31" +sdkApiLevel="android-33" 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 2139fc01..4a49fd3f 100755 --- a/coin/provisioning/qtci-macos-11-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-11-arm/30-android.sh @@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="28.0.3" +sdkBuildToolsVersion="33.0.1" # this is compile sdk version -sdkApiLevel="android-28" +sdkApiLevel="android-33" 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 a73fa364..4a49fd3f 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh @@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="31.0.0" +sdkBuildToolsVersion="33.0.1" # this is compile sdk version -sdkApiLevel="android-31" +sdkApiLevel="android-33" 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 1d268576..d65ff7a7 100755 --- a/coin/provisioning/qtci-macos-12-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-12-arm/30-android.sh @@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="28.0.3" +sdkBuildToolsVersion="33.0.1" # this is compile sdk version -sdkApiLevel="android-28" +sdkApiLevel="android-33" 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 1d268576..d65ff7a7 100755 --- a/coin/provisioning/qtci-macos-13-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-13-arm/30-android.sh @@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="28.0.3" +sdkBuildToolsVersion="33.0.1" # this is compile sdk version -sdkApiLevel="android-28" +sdkApiLevel="android-33" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" -- cgit v1.2.3