1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "Android: update to Gradle 8.12 and AGP 8.8.0""

Browse Source 
This reverts commit 22f33e1bd2c43e0223cd52b94e6ecead56a2e1b5.

Reason for revert: Needed provisioning changes are now in

Change-Id: Ibc1d1833942394efec0c24dc7e7a3e6ada5b8eea
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
This commit is contained in:
Jani Heikkinen 2025-02-25 12:39:32 +00:00 committed by The Qt Project
parent 37c60080dd
commit b0e9665e7d
8 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

3
src/3rdparty/gradle/gradlew vendored
View File

@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum

4
src/3rdparty/gradle/qt_attribution.json vendored
View File

@ -4,8 +4,8 @@
"QDocModule": "qtcore", "QDocModule": "qtcore",
"QtParts": ["tools"], "QtParts": ["tools"],
"Homepage": "https://gradle.org", "Homepage": "https://gradle.org",
"Version": "8.10", "Version": "8.12",
"DownloadLocation": "https://github.com/gradle/gradle/releases/tag/v8.10.0", "DownloadLocation": "https://github.com/gradle/gradle/releases/tag/v8.12.0",
"PURL": "pkg:github/gradle/gradle@v$<VERSION>", "PURL": "pkg:github/gradle/gradle@v$<VERSION>",
"CPE": "cpe:2.3:a:gradle:gradle:$<VERSION>:*:*:*:*:*:*:*", "CPE": "cpe:2.3:a:gradle:gradle:$<VERSION>:*:*:*:*:*:*:*",
"QtUsage": "Needed to create Android packages", "QtUsage": "Needed to create Android packages",

2
src/android/jar/build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.6.0' classpath 'com.android.tools.build:gradle:8.8.0'
} }
} }

2
src/android/templates/build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
dependencies { dependencies {
//noinspection AndroidGradlePluginVersion //noinspection AndroidGradlePluginVersion
classpath 'com.android.tools.build:gradle:8.6.0' classpath 'com.android.tools.build:gradle:8.8.0'
} }
} }

2
src/network/android/jar/build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.6.0' classpath 'com.android.tools.build:gradle:8.8.0'
} }
} }

2
src/plugins/networkinformation/android/jar/build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.6.0' classpath 'com.android.tools.build:gradle:8.8.0'
} }
} }

2
tests/auto/corelib/platform/android_legacy_packaging/testdata/build.gradle vendored
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.6.0' classpath 'com.android.tools.build:gradle:8.8.0'
} }
} }