diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-09-30 14:28:29 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-04 12:52:49 +0000 |
| commit | 5893f0d3dff8d01d39d8758a67c7ba2d9dc645e3 (patch) | |
| tree | 6cd98f6f2384d50884db9dc57190ffa4146b4c06 | |
| parent | eefe05467dec1184114c0e39af558f22a3a111af (diff) | |
Coin: bump Android platform sdk and build tools version to 31
Use latest platform and build tools.
Change-Id: I8ddfe79706470918d956a97876a5d140a57ec87b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 286a294daf3ca7b6e9656638b46fb8fa8f74cdcf)
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 72555500..760cc597 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="30.0.3" -sdkApiLevel="android-30" +sdkBuildToolsVersion="31.0.0" +sdkApiLevel="android-31" toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 8ab06d82..118f74a4 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-30" -$sdkBuildToolsVersion = "30.0.3" +$sdkApiLevel = "android-31" +$sdkBuildToolsVersion = "31.0.0" $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 f51931c6..e75052d0 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="30.0.3" +sdkBuildToolsVersion="31.0.0" # this is compile sdk version -sdkApiLevel="android-30" +sdkApiLevel="android-31" 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 f51931c6..e75052d0 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="30.0.3" +sdkBuildToolsVersion="31.0.0" # this is compile sdk version -sdkApiLevel="android-30" +sdkApiLevel="android-31" 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 f51931c6..e75052d0 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="30.0.3" +sdkBuildToolsVersion="31.0.0" # this is compile sdk version -sdkApiLevel="android-30" +sdkApiLevel="android-31" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" |