lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-09-08 10:07:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Android: bump to Gradle 9.5.1 and AGP 9.2.1

Browse Source 
Following Qt 6.12 release 3rd party components update.

Task-number: QTBUG-146315
Change-Id: I688abb791777ac12808f479428cfc95d07f9460b
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit fec1887c6e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia
2026-07-23 15:39:00 +03:00
committed by Qt Cherry-pick Bot
parent 5f4400aa72
commit 71992859b7
7 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coin/provisioning/common/linux/gradle.sh
+3
View File
@@ -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."
coin/provisioning/common/macos/gradle.sh
+3
View File
@@ -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."
coin/provisioning/common/shared/gradle/project/gradle/libs.versions.toml
+1 -1
View File
@@ -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"
coin/provisioning/common/shared/gradle/project/gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -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
coin/provisioning/common/windows/gradle.ps1
+3
View File
@@ -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."
gradle/libs.versions.toml
+1 -1
View File
@@ -1,5 +1,5 @@
[versions]
agp = "9.0.0"
agp = "9.2.1"
[plugins]
android-library = { id = "com.android.library", version.ref = "agp" }
gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -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