From 71992859b72f6b7ef0ce99f6f5202e15f38e8073 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 23 Jul 2026 15:39:00 +0300 Subject: [PATCH] Android: bump to Gradle 9.5.1 and AGP 9.2.1 Following Qt 6.12 release 3rd party components update. Task-number: QTBUG-146315 Change-Id: I688abb791777ac12808f479428cfc95d07f9460b Reviewed-by: Ville-Pekka Karhu (cherry picked from commit fec1887c6ead5e378f1bea6b09994da476fb019f) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/linux/gradle.sh | 3 +++ coin/provisioning/common/macos/gradle.sh | 3 +++ .../common/shared/gradle/project/gradle/libs.versions.toml | 2 +- .../gradle/project/gradle/wrapper/gradle-wrapper.properties | 2 +- coin/provisioning/common/windows/gradle.ps1 | 3 +++ gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 13 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/linux/gradle.sh b/coin/provisioning/common/linux/gradle.sh index 420a9671..4c335c0b 100755 --- a/coin/provisioning/common/linux/gradle.sh +++ b/coin/provisioning/common/linux/gradle.sh @@ -104,7 +104,10 @@ cacheGradleProfile () { rm -rf "$tmp" } +# Cache both the current and the previous versions to avoid issues during bumps. seedGradleDistribution 9.3.1 "b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06" cacheGradleProfile gradle=9.3.1 agp=9.0.0 +seedGradleDistribution 9.5.1 "bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f" +cacheGradleProfile gradle=9.5.1 agp=9.2.1 echo "Cached Gradle distributions and dependencies under $HOME/.gradle." diff --git a/coin/provisioning/common/macos/gradle.sh b/coin/provisioning/common/macos/gradle.sh index 420a9671..4c335c0b 100755 --- a/coin/provisioning/common/macos/gradle.sh +++ b/coin/provisioning/common/macos/gradle.sh @@ -104,7 +104,10 @@ cacheGradleProfile () { rm -rf "$tmp" } +# Cache both the current and the previous versions to avoid issues during bumps. seedGradleDistribution 9.3.1 "b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06" cacheGradleProfile gradle=9.3.1 agp=9.0.0 +seedGradleDistribution 9.5.1 "bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f" +cacheGradleProfile gradle=9.5.1 agp=9.2.1 echo "Cached Gradle distributions and dependencies under $HOME/.gradle." diff --git a/coin/provisioning/common/shared/gradle/project/gradle/libs.versions.toml b/coin/provisioning/common/shared/gradle/project/gradle/libs.versions.toml index 21e7d511..aa98a6c0 100644 --- a/coin/provisioning/common/shared/gradle/project/gradle/libs.versions.toml +++ b/coin/provisioning/common/shared/gradle/project/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "9.0.0" +agp = "9.2.1" core = "1.17.0" appcompat = "1.7.1" material = "1.13.0" diff --git a/coin/provisioning/common/shared/gradle/project/gradle/wrapper/gradle-wrapper.properties b/coin/provisioning/common/shared/gradle/project/gradle/wrapper/gradle-wrapper.properties index 37f78a6a..5dd3c012 100644 --- a/coin/provisioning/common/shared/gradle/project/gradle/wrapper/gradle-wrapper.properties +++ b/coin/provisioning/common/shared/gradle/project/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/coin/provisioning/common/windows/gradle.ps1 b/coin/provisioning/common/windows/gradle.ps1 index 0cffeccc..23115c98 100644 --- a/coin/provisioning/common/windows/gradle.ps1 +++ b/coin/provisioning/common/windows/gradle.ps1 @@ -102,7 +102,10 @@ function Cache-GradleProfile([string[]]$VersionProfile) { Remove-Item -Recurse -Force $project } +# Cache both the current and the previous versions to avoid issues during bumps. Seed-GradleDistribution "9.3.1" "b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06" Cache-GradleProfile "gradle=9.3.1", "agp=9.0.0" +Seed-GradleDistribution "9.5.1" "bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f" +Cache-GradleProfile "gradle=9.5.1", "agp=9.2.1" Write-Host "Cached Gradle distributions and dependencies under $env:USERPROFILE\.gradle." diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9a434281..3912d804 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "9.0.0" +agp = "9.2.1" [plugins] android-library = { id = "com.android.library", version.ref = "agp" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f78a6a..5dd3c012 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME