diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 4d7d88f6..270f4e54 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="35.0.1" -sdkApiLevel="android-35" +sdkBuildToolsVersion="36.0.0" +sdkApiLevel="android-36" toolsSha1="5fdcc763663eefb86a5b8879697aa6088b041e70" ndkVersionLatest="r27c" diff --git a/coin/provisioning/common/macos/android.sh b/coin/provisioning/common/macos/android.sh index f9f2bf6b..57c04348 100755 --- a/coin/provisioning/common/macos/android.sh +++ b/coin/provisioning/common/macos/android.sh @@ -41,9 +41,11 @@ ndkSha1Preview="09be4f8fb626a9c93415198ea8e75d8d82f528fa" ndkVersionNightly1=$ndkVersionLatest # Set as same version as latest = skip NDK install in provisioning 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/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 72d25def..7e69eb18 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-35" -$sdkBuildToolsVersion = "35.0.1" +$sdkApiLevel = "android-36" +$sdkBuildToolsVersion = "36.0.0" $toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile" $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile" $toolsChecksum = "54a582f3bf73e04253602f2d1c80bd5868aac115"