Update dependency gradle from 8.9 to 8.12

TWiStErRob · Dec 22, 2024 · 9d5b38c · 9d5b38c
1 parent bef19c8
commit 9d5b38c
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -23,11 +23,11 @@ For details on what was changed in different versions, see [CHANGELOG](CHANGELOG
 
 ## Compatibility
 
-Android Gradle Plugin 3.1.4 — 8.7.3 on Gradle 4.9 — 8.9 as listed in
+Android Gradle Plugin 3.1.4 — 8.7.3 on Gradle 4.9 — 8.12 as listed in
 [AGP's compatibility guide](https://developer.android.com/studio/releases/gradle-plugin#updating-gradle)
 are covered by different plugin versions.
 
-Currently supported version are Android Gradle Plugin 7.0.2 — 8.7.3 on Gradle 7.0 — 8.9 where compatible.
+Currently supported version are Android Gradle Plugin 7.0.2 — 8.7.3 on Gradle 7.0 — 8.12 where compatible.
 
 | AGP →<br/>Gradle ↓ |   3.1.x    |   3.2.x    |    3.3.x     |    3.4.x     |     3.5.x     |     3.6.x     |     4.0.x     |     4.1.x     |   4.2.x ^3    |  7.0.x   |  7.1.x   |  7.2.x   |  7.3.x   |  7.4.x   |  8.0.x   |  8.1.x   |  8.2.x   |  8.3.x   |  8.4.x   |
 |:-------------------|:----------:|:----------:|:------------:|:------------:|:-------------:|:-------------:|:-------------:|:-------------:|:-------------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|

diff --git a/docs/examples/local/gradle/wrapper/gradle-wrapper.properties b/docs/examples/local/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/docs/examples/release/gradle/wrapper/gradle-wrapper.jar b/docs/examples/release/gradle/wrapper/gradle-wrapper.jar
diff --git a/docs/examples/release/gradle/wrapper/gradle-wrapper.properties b/docs/examples/release/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/docs/examples/release/gradlew b/docs/examples/release/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/docs/examples/snapshot/gradle/wrapper/gradle-wrapper.jar b/docs/examples/snapshot/gradle/wrapper/gradle-wrapper.jar
diff --git a/docs/examples/snapshot/gradle/wrapper/gradle-wrapper.properties b/docs/examples/snapshot/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/docs/examples/snapshot/gradlew b/docs/examples/snapshot/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradle.properties b/gradle.properties
@@ -39,7 +39,7 @@ net.twisterrob.test.android.pluginVersion=8.7.3
 # Kotlin: AGP 7.0.4-7.2.2 -> Kotlin 1.4.32; AGP 7.3.0- -> Kotlin 1.6.21
 net.twisterrob.test.kotlin.pluginVersion=1.6.21
 # Gradle: 7.0.2, 7.2, 7.3.3, 7.4.2, 7.5.1, 7.6.1, 8.0.2, 8.1, 8.2.1, 8.4
-net.twisterrob.gradle.runner.gradleVersion=8.9
+net.twisterrob.gradle.runner.gradleVersion=8.12
 # Java: AGP 7.0.0-7.4.2 -> Java 11; AGP 8.0.0-∞ -> Java 17; currently unused.
 net.twisterrob.test.gradle.javaHomeEnv=JAVA17_HOME
 

diff --git a/gradle/plugins/gradle/wrapper/gradle-wrapper.jar b/gradle/plugins/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/plugins/gradle/wrapper/gradle-wrapper.properties b/gradle/plugins/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradle/plugins/gradlew b/gradle/plugins/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git 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-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/graph/gradle/wrapper/gradle-wrapper.jar b/graph/gradle/wrapper/gradle-wrapper.jar
diff --git a/graph/gradle/wrapper/gradle-wrapper.properties b/graph/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/graph/gradlew b/graph/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/quality/src/test/kotlin/net/twisterrob/gradle/quality/tasks/VersionsTaskTest.kt b/quality/src/test/kotlin/net/twisterrob/gradle/quality/tasks/VersionsTaskTest.kt
@@ -119,7 +119,7 @@ class VersionsTaskTest : BaseIntgTest() {
 	}
 
 	@Test fun `print checkstyle version (Gradle 8 latest)`() {
-		gradle.gradleVersion = GradleVersion.version("8.9")
+		gradle.gradleVersion = GradleVersion.version("8.12")
 
 		@Language("gradle")
 		val script = """
@@ -135,12 +135,12 @@ class VersionsTaskTest : BaseIntgTest() {
 		}
 
 		result.assertSuccess(":qualityVersions")
-		result.assertHasOutputLine("""Gradle version: 8.9""")
+		result.assertHasOutputLine("""Gradle version: 8.12""")
 		result.assertHasOutputLine("""Checkstyle version: 9.3""")
 	}
 
 	@Test fun `print pmd version (Gradle 8 latest)`() {
-		gradle.gradleVersion = GradleVersion.version("8.9")
+		gradle.gradleVersion = GradleVersion.version("8.12")
 
 		@Language("gradle")
 		val script = """
@@ -156,7 +156,7 @@ class VersionsTaskTest : BaseIntgTest() {
 		}
 
 		result.assertSuccess(":qualityVersions")
-		result.assertHasOutputLine("""Gradle version: 8.9""")
+		result.assertHasOutputLine("""Gradle version: 8.12""")
 		result.assertHasOutputLine("""PMD version: 6.55.0""")
 	}