lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-24 16:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update build tools and platforms API level to 29

Browse Source 
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 53220710f5)
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Assam Boudjelthia
2021-05-31 17:06:51 +03:00
committed by Heikki Halmet
parent 0afdcac0c4
commit b842483f93
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/provisioning/common/windows/android.ps1
View File

@@ -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"

4
coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh
View File

@@ -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"

4
coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh
View File

@@ -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"

4
coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh
View File

@@ -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"