From 345aae01f5e0c512d8eeada41bb69865904b6bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konsta=20Alaj=C3=A4rvi?= Date: Tue, 24 Sep 2024 11:59:57 +0300 Subject: [PATCH] Provisioning: bump Android sdkApiLevel to 35 This patch bumps the sdkApiLevel used in Coin to 35. Task-number: QTBUG-129461 Task-number: QTBUG-130283 Change-Id: Ia26248982a2807b2d3554d1a7a7394efcf13f834 Reviewed-by: Axel Spoerl --- coin/provisioning/common/linux/android_linux.sh | 2 +- coin/provisioning/common/macos/android.sh | 2 +- coin/provisioning/common/windows/android.ps1 | 2 +- coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh | 2 +- coin/provisioning/qtci-macos-11-arm/30-android.sh | 2 +- coin/provisioning/qtci-macos-11-x86_64/30-android.sh | 2 +- coin/provisioning/qtci-macos-12-arm/30-android.sh | 2 +- coin/provisioning/qtci-macos-13-arm/30-android.sh | 2 +- coin/provisioning/qtci-macos-14-arm/30-android.sh | 2 +- coin/provisioning/qtci-macos-15-arm/30-android.sh | 2 +- 10 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 5c4b07ef..81869afd 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -27,7 +27,7 @@ toolsFile="commandlinetools-linux-6609375_latest.zip" ndkVersionLatest="r26b" ndkVersionDefault=$ndkVersionLatest sdkBuildToolsVersion="34.0.0" -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4" diff --git a/coin/provisioning/common/macos/android.sh b/coin/provisioning/common/macos/android.sh index b7dc953f..d8466da5 100755 --- a/coin/provisioning/common/macos/android.sh +++ b/coin/provisioning/common/macos/android.sh @@ -24,7 +24,7 @@ ndkVersionLatest="r26b" ndkVersionDefault="$ndkVersionLatest" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index b594238c..cdb69181 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -24,7 +24,7 @@ $ndkZip = "C:\Windows\Temp\android_ndk.zip" $toolsVersion = "2.1" $toolsFile = "commandlinetools-win-6609375_latest.zip" $sdkApi = "ANDROID_API_VERSION" -$sdkApiLevel = "android-34" +$sdkApiLevel = "android-35" $sdkBuildToolsVersion = "34.0.0" $toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile" $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile" 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 3ae2cbf6..b84b7ee1 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 @@ -24,7 +24,7 @@ ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" 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 3ae2cbf6..b84b7ee1 100755 --- a/coin/provisioning/qtci-macos-11-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-11-arm/30-android.sh @@ -24,7 +24,7 @@ ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" 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 11bcf7ad..175be765 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh @@ -24,7 +24,7 @@ ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" 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 6259b71e..d1c60da2 100755 --- a/coin/provisioning/qtci-macos-12-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-12-arm/30-android.sh @@ -24,7 +24,7 @@ ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" 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 6259b71e..d1c60da2 100755 --- a/coin/provisioning/qtci-macos-13-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-13-arm/30-android.sh @@ -24,7 +24,7 @@ ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-14-arm/30-android.sh b/coin/provisioning/qtci-macos-14-arm/30-android.sh index 6259b71e..d1c60da2 100755 --- a/coin/provisioning/qtci-macos-14-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-14-arm/30-android.sh @@ -24,7 +24,7 @@ ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-15-arm/30-android.sh b/coin/provisioning/qtci-macos-15-arm/30-android.sh index 6259b71e..d1c60da2 100755 --- a/coin/provisioning/qtci-macos-15-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-15-arm/30-android.sh @@ -24,7 +24,7 @@ ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile"