diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-08-12 18:33:23 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-26 18:17:13 +0000 |
| commit | 8ab13223a5535f9ad3cb0beb08a87dfe6664c82b (patch) | |
| tree | 039af2a037ead7fb8cf08948d9856be7758bd23b | |
| parent | 86a34fb5d7c6377d7c7f658eeffd66d8aac2a393 (diff) | |
Coin: bump Android build tools and platform sdk level from 29 to 30
Google requires target SDK level 30 for apps that can be accepted to
the Play Store. This change goes together with bumping the default
target sdk in qtbase (from 29 to 30 as well).
Ideally, build tools should be kept up to date as well anyway.
Change-Id: Iac58b7250d7cb639a4d760cf12e7630c9d0b77cc
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
(cherry picked from commit 6ac98447b588fc4b739cea4cecb2a32ee1f91378)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
5 files changed, 10 insertions, 10 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 71436864..55def206 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -55,8 +55,8 @@ toolsVersion="2.1" toolsFile="commandlinetools-linux-6609375_latest.zip" ndkVersion="r22b" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" -sdkBuildToolsVersion="29.0.3" -sdkApiLevel="android-29" +sdkBuildToolsVersion="30.0.3" +sdkApiLevel="android-30" toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 08dae6f2..82c7ee50 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -51,8 +51,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" $toolsVersion = "2.1" $toolsFile = "commandlinetools-win-6609375_latest.zip" $sdkApi = "ANDROID_API_VERSION" -$sdkApiLevel = "android-29" -$sdkBuildToolsVersion = "29.0.3" +$sdkApiLevel = "android-30" +$sdkBuildToolsVersion = "30.0.3" $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.14-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh index 80aaa6a8..283e2b08 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh @@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r22b" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" -sdkBuildToolsVersion="29.0.3" +sdkBuildToolsVersion="30.0.3" # this is compile sdk version -sdkApiLevel="android-29" +sdkApiLevel="android-30" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" 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 80aaa6a8..283e2b08 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 @@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r22b" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" -sdkBuildToolsVersion="29.0.3" +sdkBuildToolsVersion="30.0.3" # this is compile sdk version -sdkApiLevel="android-29" +sdkApiLevel="android-30" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh b/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh index 80aaa6a8..283e2b08 100755 --- a/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh @@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r22b" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" -sdkBuildToolsVersion="29.0.3" +sdkBuildToolsVersion="30.0.3" # this is compile sdk version -sdkApiLevel="android-29" +sdkApiLevel="android-30" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" |