summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <[email protected]>2025-06-22 18:06:54 +0300
committerAssam Boudjelthia <[email protected]>2025-06-28 03:52:49 +0300
commitbb12c984b2c838bdb06169ef7d659384c02c8b82 (patch)
treee27a3bb8eb3cb2db0086f6e5f9c8aa5d181d5a28
parent943df16c72065cb7f0d13b9f0bceab06abfe3f71 (diff)
Android: update to Gradle 8.14.2 and AGP 8.10.1
Update to latest versions for Gradle: * Gradle 8.12 -> 8.14.0 * Android Gradle Plugin 8.8.0 -> 8.10.1. [ChangeLog][Third-Party Code] Updated Gradle to 8.14.1 and AGP to 8.10.1. Task-number: QTBUG-137782 Change-Id: Ifbc808e18412f6e2e45612612d36a1f9bf57c1a9 Reviewed-by: Ville Voutilainen <[email protected]>
-rw-r--r--doc/global/macros.qdocconf4
-rw-r--r--src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.jarbin43583 -> 43764 bytes
-rw-r--r--src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties2
-rwxr-xr-xsrc/3rdparty/gradle/gradlew6
-rw-r--r--src/3rdparty/gradle/gradlew.bat4
-rw-r--r--src/3rdparty/gradle/qt_attribution.json4
-rw-r--r--src/android/jar/build.gradle2
-rw-r--r--src/android/templates/build.gradle2
-rw-r--r--src/network/android/jar/build.gradle2
-rw-r--r--src/plugins/networkinformation/android/jar/build.gradle2
-rw-r--r--tests/auto/corelib/platform/android_legacy_packaging/testdata/build.gradle2
11 files changed, 15 insertions, 15 deletions
diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf
index e239174ca6d..87e8be30443 100644
--- a/doc/global/macros.qdocconf
+++ b/doc/global/macros.qdocconf
@@ -96,8 +96,8 @@ macro.AndroidMinVer = "9"
macro.AndroidMaxVer = "15"
macro.AndroidPlatformVer = "35"
macro.AndroidBuildToolsVer = "35.0.1"
-macro.GradleVer = "8.10"
-macro.AGPVer = "8.6.0"
+macro.GradleVer = "8.14.2"
+macro.AGPVer = "8.10.1"
macro.AAOSVer = "10 to 13"
macro.beginfloatleft.HTML = "<div style=\"float: left; margin-right: 2em\">"
diff --git a/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.jar b/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.jar
index a4b76b9530d..1b33c55baab 100644
--- a/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.jar
+++ b/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties b/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties
index cea7a793a84..ff23a68d70f 100644
--- a/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/src/3rdparty/gradle/gradlew b/src/3rdparty/gradle/gradlew
index 057afac53f3..0f14772e0e5 100755
--- a/src/3rdparty/gradle/gradlew
+++ b/src/3rdparty/gradle/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
@@ -205,7 +205,7 @@ fi
DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
-# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
- org.gradle.wrapper.GradleWrapperMain \
+ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.
diff --git a/src/3rdparty/gradle/gradlew.bat b/src/3rdparty/gradle/gradlew.bat
index 640d68685c1..8de1053a1f9 100644
--- a/src/3rdparty/gradle/gradlew.bat
+++ b/src/3rdparty/gradle/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
:execute
@rem Setup the command line
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/src/3rdparty/gradle/qt_attribution.json b/src/3rdparty/gradle/qt_attribution.json
index 19c9147c632..d2966e5c8b9 100644
--- a/src/3rdparty/gradle/qt_attribution.json
+++ b/src/3rdparty/gradle/qt_attribution.json
@@ -4,8 +4,8 @@
"QDocModule": "qtcore",
"QtParts": ["tools"],
"Homepage": "https://gradle.org",
- "Version": "8.12",
- "DownloadLocation": "https://github.com/gradle/gradle/releases/tag/v8.12.0",
+ "Version": "8.14.2",
+ "DownloadLocation": "https://github.com/gradle/gradle/releases/tag/v8.14.2",
"PURL": "pkg:github/gradle/gradle@v$<VERSION>",
"CPE": "cpe:2.3:a:gradle:gradle:$<VERSION>:*:*:*:*:*:*:*",
"QtUsage": "Needed to create Android packages",
diff --git a/src/android/jar/build.gradle b/src/android/jar/build.gradle
index 2ab607b62ea..74ecff6b75f 100644
--- a/src/android/jar/build.gradle
+++ b/src/android/jar/build.gradle
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:8.8.0'
+ classpath 'com.android.tools.build:gradle:8.10.1'
}
}
diff --git a/src/android/templates/build.gradle b/src/android/templates/build.gradle
index 6f39acc58fa..6595cb5358f 100644
--- a/src/android/templates/build.gradle
+++ b/src/android/templates/build.gradle
@@ -6,7 +6,7 @@ buildscript {
dependencies {
//noinspection AndroidGradlePluginVersion
- classpath 'com.android.tools.build:gradle:8.8.0'
+ classpath 'com.android.tools.build:gradle:8.10.1'
}
}
diff --git a/src/network/android/jar/build.gradle b/src/network/android/jar/build.gradle
index 99e835c6d43..f1f470b6635 100644
--- a/src/network/android/jar/build.gradle
+++ b/src/network/android/jar/build.gradle
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:8.8.0'
+ classpath 'com.android.tools.build:gradle:8.10.1'
}
}
diff --git a/src/plugins/networkinformation/android/jar/build.gradle b/src/plugins/networkinformation/android/jar/build.gradle
index 99e835c6d43..f1f470b6635 100644
--- a/src/plugins/networkinformation/android/jar/build.gradle
+++ b/src/plugins/networkinformation/android/jar/build.gradle
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:8.8.0'
+ classpath 'com.android.tools.build:gradle:8.10.1'
}
}
diff --git a/tests/auto/corelib/platform/android_legacy_packaging/testdata/build.gradle b/tests/auto/corelib/platform/android_legacy_packaging/testdata/build.gradle
index 806614e113f..cbdd833e2ae 100644
--- a/tests/auto/corelib/platform/android_legacy_packaging/testdata/build.gradle
+++ b/tests/auto/corelib/platform/android_legacy_packaging/testdata/build.gradle
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:8.8.0'
+ classpath 'com.android.tools.build:gradle:8.10.1'
}
}