Upgrade gradle to version 8.12

weisJ · Jan 16, 2025 · 6116241 · 6116241
1 parent 2d1dc7f
commit 6116241
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/annotations-processor/build.gradle.kts b/annotations-processor/build.gradle.kts
@@ -15,7 +15,7 @@ tasks {
                 """
                 Bundle-SymbolicName: com.github.weisj.jsvg.annotations.processor
 
-                -jpms-module-info
+                -jpms-module-info:
                 -removeheaders: Private-Package,Tool
             """,
             )

diff --git a/annotations/build.gradle.kts b/annotations/build.gradle.kts
@@ -16,7 +16,7 @@ tasks {
                 -exportcontents: \
                   com.github.weisj.jsvg.annoations
 
-                -jpms-module-info
+                -jpms-module-info:
                 -removeheaders: Private-Package,Tool
             """,
             )

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

diff --git a/gradlew b/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/jsvg/build.gradle.kts b/jsvg/build.gradle.kts
@@ -32,8 +32,14 @@ dependencies {
 tasks {
 
     compileTestJava {
-        sourceCompatibility = JavaVersion.VERSION_21.toString()
-        targetCompatibility = JavaVersion.VERSION_21.toString()
+        javaToolchains {
+            javaCompiler.set(
+                compilerFor {
+                    languageVersion.set(JavaLanguageVersion.of(21))
+                },
+            )
+        }
+        options.release.set(21)
     }
 
     jar {
@@ -59,7 +65,7 @@ tasks {
                 Import-Package: !com.google.errorprone.annotations,\
                   *
 
-                -jpms-module-info
+                -jpms-module-info:
                 -jpms-module-info-options: \
                   com.google.errorprone.annotations;static="true";transitive="false",\
                   org.jetbrains.annotations;static="true";transitive="false",\