From f22e9795d9a32fc4e9f4d6f2a70c2f831028342b Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Wed, 15 May 2024 16:21:48 +0300 Subject: [PATCH] Android: Update Gradle to 8.7 and Android Gradle Plug-in (AGP) to 8.4.0 Updated Gradle to 8.7 Updated AGP to 8.4.0 Updated same versions in examples and docs macros Task-number: QTBUG-113383 Change-Id: Ib2e841f2e57e576c5d689a208a275ce5e9e4b80f Reviewed-by: Assam Boudjelthia --- doc/global/macros.qdocconf | 4 ++-- .../gradle/gradle/wrapper/gradle-wrapper.properties | 2 +- src/3rdparty/gradle/qt_attribution.json | 6 +++--- src/android/jar/build.gradle | 2 +- src/android/templates/build.gradle | 2 +- src/network/android/jar/build.gradle | 2 +- src/plugins/networkinformation/android/jar/build.gradle | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf index b3260b0985..0bb02323c1 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -96,8 +96,8 @@ macro.AndroidMinVer = "9" macro.AndroidMaxVer = "14" macro.AndroidPlatformVer = "34" macro.AndroidBuildToolsVer = "34.0.0" -macro.GradleVer = "8.3" -macro.AGPVer = "8.2.2" +macro.GradleVer = "8.7" +macro.AGPVer = "8.4.0" macro.AAOSVer = "10 to 13" macro.beginfloatleft.HTML = "
" diff --git a/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties b/src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.properties index ac72c34e8a..b82aa23a4f 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.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/3rdparty/gradle/qt_attribution.json b/src/3rdparty/gradle/qt_attribution.json index 8e759c8877..bbb069c2fb 100644 --- a/src/3rdparty/gradle/qt_attribution.json +++ b/src/3rdparty/gradle/qt_attribution.json @@ -4,11 +4,11 @@ "QDocModule": "qtcore", "QtParts": ["tools"], "Homepage": "https://gradle.org", - "Version": "8.3", - "DownloadLocation": "https://github.com/gradle/gradle/releases/tag/v8.3.0", + "Version": "8.7", + "DownloadLocation": "https://github.com/gradle/gradle/releases/tag/v8.7.0", "QtUsage": "Needed to create Android packages", "License": "Apache License 2.0", "LicenseId": "Apache-2.0", "LicenseFile": "LICENSE", - "Copyright": "Copyright (C) 2023 Gradle Inc." + "Copyright": "Copyright (C) 2024 Gradle Inc." } diff --git a/src/android/jar/build.gradle b/src/android/jar/build.gradle index 99ad69aeac..6b5923f713 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.0.2' + classpath 'com.android.tools.build:gradle:8.4.0' } } diff --git a/src/android/templates/build.gradle b/src/android/templates/build.gradle index c5d92698a3..4a93923277 100644 --- a/src/android/templates/build.gradle +++ b/src/android/templates/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.2' + classpath 'com.android.tools.build:gradle:8.4.0' } } diff --git a/src/network/android/jar/build.gradle b/src/network/android/jar/build.gradle index 86a42bd9c1..ea6d06c257 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.0.2' + classpath 'com.android.tools.build:gradle:8.4.0' } } diff --git a/src/plugins/networkinformation/android/jar/build.gradle b/src/plugins/networkinformation/android/jar/build.gradle index 86a42bd9c1..ea6d06c257 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.0.2' + classpath 'com.android.tools.build:gradle:8.4.0' } }