diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 717a1434..6feb6e12 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -25,8 +25,8 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android" toolsVersion="19.0" toolsFile="commandlinetools-linux-13114758_latest.zip" toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile" -sdkBuildToolsVersion="36.0.0" -sdkApiLevel="android-36" +sdkBuildToolsVersion="37.0.0" +sdkApiLevel="android-37.0" toolsSha1="5fdcc763663eefb86a5b8879697aa6088b041e70" ndkVersionLatest="r27c" diff --git a/coin/provisioning/common/macos/android.sh b/coin/provisioning/common/macos/android.sh index aa92ac42..73eaca66 100755 --- a/coin/provisioning/common/macos/android.sh +++ b/coin/provisioning/common/macos/android.sh @@ -25,8 +25,8 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android" toolsVersion="19.0" toolsFile="commandlinetools-mac-13114758_latest.zip" toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile" -sdkBuildToolsVersion="35.0.1" -sdkApiLevel="android-35" +sdkBuildToolsVersion="37.0.0" +sdkApiLevel="android-37.0" toolsSha1="c3e06a1959762e89167d1cbaa988605f6f7c1d24" ndkVersionLatest="r27c" @@ -43,9 +43,6 @@ ndkVersionNightly1=$ndkVersionLatest # Set as same version as latest = skip NDK ndkSha1Nightly1=$ndkSha1Latest ndkVersionNightly2=$ndkVersionLatest ndkSha1Nightly2=$ndkSha1Latest -sdkBuildToolsVersion="36.0.0" -# this is compile sdk version -sdkApiLevel="android-36" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/shared/gradle/project/app/build.gradle b/coin/provisioning/common/shared/gradle/project/app/build.gradle index 3f35c318..d3abde9b 100644 --- a/coin/provisioning/common/shared/gradle/project/app/build.gradle +++ b/coin/provisioning/common/shared/gradle/project/app/build.gradle @@ -4,7 +4,8 @@ plugins { android { namespace = 'org.qtproject.qt.gradlecache.app' - compileSdk = 36 + compileSdk = 37 + compileSdkMinor = 0 defaultConfig { applicationId 'org.qtproject.qt.gradlecache.app' diff --git a/coin/provisioning/common/shared/gradle/project/feature/build.gradle b/coin/provisioning/common/shared/gradle/project/feature/build.gradle index 52c898bb..70b9eb2b 100644 --- a/coin/provisioning/common/shared/gradle/project/feature/build.gradle +++ b/coin/provisioning/common/shared/gradle/project/feature/build.gradle @@ -4,7 +4,8 @@ plugins { android { namespace = 'org.qtproject.qt.gradlecache.feature' - compileSdk = 36 + compileSdk = 37 + compileSdkMinor = 0 defaultConfig { minSdk = 28 diff --git a/coin/provisioning/common/shared/gradle/project/lib/build.gradle b/coin/provisioning/common/shared/gradle/project/lib/build.gradle index 35a550e1..922a3978 100644 --- a/coin/provisioning/common/shared/gradle/project/lib/build.gradle +++ b/coin/provisioning/common/shared/gradle/project/lib/build.gradle @@ -4,7 +4,8 @@ plugins { android { namespace = 'org.qtproject.qt.gradlecache.lib' - compileSdk = 36 + compileSdk = 37 + compileSdkMinor = 0 defaultConfig { minSdk = 28 diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 7097e183..a9d448e9 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -41,8 +41,8 @@ $ndkOfficialUrlNightly2 = "https://dl.google.com/android/repository/android-ndk- $toolsVersion = "19.0" $toolsFile = "commandlinetools-win-13114758_latest.zip" $sdkApi = "ANDROID_API_VERSION" -$sdkApiLevel = "android-36" -$sdkBuildToolsVersion = "36.0.0" +$sdkApiLevel = "android-37.0" +$sdkBuildToolsVersion = "37.0.0" $toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile" $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile" $toolsChecksum = "54a582f3bf73e04253602f2d1c80bd5868aac115"