diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-05-31 17:06:51 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2021-06-02 11:18:57 +0300 |
| commit | b842483f93fd418b91ddf24b8f72b1d758b94f75 (patch) | |
| tree | c7c164f72bf59842b96956ca22b86dae6e6e4413 | |
| parent | 0afdcac0c40e0428d4b8895ac92acc1d7e530db3 (diff) | |
Update build tools and platforms API level to 29
Windows and macOS hosts were still using 28 while Linux uses 29.
Change-Id: I36afd17277605b6478bf840340c0341a7f327caa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 53220710f5e4487c10db908abc20c515aadeb99e)
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
4 files changed, 8 insertions, 8 deletions
diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index b37b045a..08dae6f2 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-28" -$sdkBuildToolsVersion = "28.0.3" +$sdkApiLevel = "android-29" +$sdkBuildToolsVersion = "29.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 6c999522..80aaa6a8 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="28.0.3" +sdkBuildToolsVersion="29.0.3" # this is compile sdk version -sdkApiLevel="android-28" +sdkApiLevel="android-29" 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 6c999522..80aaa6a8 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="28.0.3" +sdkBuildToolsVersion="29.0.3" # this is compile sdk version -sdkApiLevel="android-28" +sdkApiLevel="android-29" 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 6c999522..80aaa6a8 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="28.0.3" +sdkBuildToolsVersion="29.0.3" # this is compile sdk version -sdkApiLevel="android-28" +sdkApiLevel="android-29" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" |