Update Gradle Wrapper

Buildscripts cleanup, Gradle 8.14

Author: Jonathing

.gitignore

@@ -7,3 +7,10 @@
 /**/build/
 /repo/
 /cache/
+
+# Tool Output - Jonathan uses the run directory
+/run/
+/output/
+
+# Jonathan's IntelliJ Fuckery
+/.idea/

build.gradle

@@ -4,42 +4,46 @@ plugins {
     id 'java-library'
     id 'idea'
     id 'maven-publish'
-    id 'net.minecraftforge.licenser' version '1.0.1'
-    id 'net.minecraftforge.gradleutils' version '2.3.6'
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
-}
-
-repositories {
-    mavenCentral()
+    alias libs.plugins.licenser
+    alias libs.plugins.gradleutils
+    alias libs.plugins.shadow
 }
 
+final projectDisplayName = 'Java Version'
+final projectVendor = 'Forge Development LLC'
+description = 'Java Version management using Disco'
 group = 'net.minecraftforge'
+version = gitversion.tagOffset
 
-version = gradleutils.tagOffsetVersion
-println('Version: ' + version)
+println "Version: $version"
+
+java {
+    // Currently JOpt is the limiting, requiring java 8
+    // But also toolchains don't support building for anything lower then 8
+    toolchain.languageVersion = JavaLanguageVersion.of 8
+    withSourcesJar()
+}
 
-tasks.register('createJavaProbeClass', buildsrc.ClassGeneratorTask) { }
+tasks.register('createJavaProbeClass', buildsrc.ClassGeneratorTask)
 
 tasks.register('javaProbeJar', Jar) {
     destinationDirectory = layout.buildDirectory.dir('libs')
     archiveBaseName = project.name
     archiveClassifier = 'probe'
+
     manifest {
         attributes([
-            'Main-Class': 'JavaProbe'
-        ] as LinkedHashMap)
-        attributes([
-            'Main-Class':            'JavaProbe',
-            'Specification-Title':   'Java Probe',
-            'Specification-Vendor':  'Forge Development LLC',
-            'Specification-Version':  gradleutils.gitInfo.tag,
-            'Implementation-Title':  'javaprobe',
-            'Implementation-Vendor': 'Forge Development LLC',
+            'Main-Class'            : 'JavaProbe',
+            'Specification-Title'   : 'Java Probe',
+            'Specification-Vendor'  : projectVendor,
+            'Specification-Version' : gitversion.info.tag,
+            'Implementation-Title'  : 'javaprobe',
+            'Implementation-Vendor' : projectVendor,
             'Implementation-Version': project.version
-        ] as LinkedHashMap)
+        ])
     }
 
-    from(createJavaProbeClass.outputFile)
+    from createJavaProbeClass.outputs.files
 }
 
 dependencies {
@@ -50,85 +54,69 @@ dependencies {
 }
 
 license {
-    header project.file('LICENSE-header.txt')
+    header rootProject.file('LICENSE-header.txt')
     newLine false
 }
 
-java {
-    // Currently JOpt is the limiting, requiring java 8
-    // But also toolchains don't support building for anything lower then 8
-    toolchain.languageVersion = JavaLanguageVersion.of(8)
-    withSourcesJar()
-}
-
-tasks.named('shadowJar', ShadowJar) {
-    final String reloc = 'net.minecraftforge.java_version.reloc.'
-    relocate 'joptsimple', reloc + 'jopt'
-    relocate 'com.google.gson', reloc + 'gson'
-    relocate 'org.kamranzafar.jtar', reloc + 'jtar'
-}
-
 tasks.named('jar', Jar) {
     manifest {
         attributes([
-            'Main-Class': 'net.minecraftforge.java_version.Main',
+            'Main-Class'           : 'net.minecraftforge.java_version.Main',
             'Automatic-Module-Name': 'net.minecraftforge.java_version',
-            'Sealed': true
-        ] as LinkedHashMap)
+            'Sealed'               : true
+        ])
         attributes([
-            'Specification-Title':   'Java Version',
-            'Specification-Vendor':  'Forge Development LLC',
-            'Specification-Version':  gradleutils.gitInfo.tag,
-            'Implementation-Title':  'Java Version',
-            'Implementation-Vendor': 'Forge Development LLC',
+            'Specification-Title'   : projectDisplayName,
+            'Specification-Vendor'  : projectVendor,
+            'Specification-Version' : gitversion.info.tag,
+            'Implementation-Title'  : projectDisplayName,
+            'Implementation-Vendor' : projectVendor,
             'Implementation-Version': project.version
-        ] as LinkedHashMap, 'net/minecraftforge/java_version/')
+        ], 'net/minecraftforge/java_version/')
     }
-    from(createJavaProbeClass.outputFile)
+
+    from createJavaProbeClass.outputs.files
 }
 
-tasks.named('compileJava', JavaCompile) {
-    dependsOn javaProbeJar
+tasks.named('shadowJar', ShadowJar) {
+    enableRelocation = true
+    relocationPrefix = 'net.minecraftforge.java_version.shadow'
+}
+
+tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
 }
 
 changelog {
     from '1.0'
 }
 
-artifacts {
-    //archives javaProbeJar
-}
-
 publishing {
-    publications.register('mavenJava', MavenPublication).configure {
-        artifactId = project.name
+    publications.register('mavenJava', MavenPublication) {
         from components.java
-        artifact(javaProbeJar)
 
-        pom {
-            name = project.name
-            description = 'Minecraft Maven Repo Generator'
-            url = 'https://github.com/MinecraftForge/java-version'
+        artifactId = project.name
+        artifact javaProbeJar
+
+        pom { pom ->
+            name = projectDisplayName
+            description = project.description
 
-            gradleutils.pom.setGitHubDetails(pom, 'java-version')
+            gradleutils.pom.setGitHubDetails pom
 
-            license gradleutils.pom.licenses.LGPLv2_1
+            licenses {
+                license gradleutils.pom.licenses.LGPLv2_1
+            }
 
             developers {
-                developer gradleutils.pom.Developers.LexManos
+                developer gradleutils.pom.developers.LexManos
             }
         }
     }
+
     repositories {
         maven gradleutils.publishingForgeMaven
     }
 }
 
-idea {
-    module {
-        // IntelliJ IDEA does not do this by itself anymore...
-        downloadJavadoc = true
-        downloadSources = true
-    }
-}
+idea.module { downloadJavadoc = downloadSources = true }

buildSrc/build.gradle

@@ -1,11 +1,9 @@
 plugins {
     id 'java-library'
-    id 'net.minecraftforge.licenser' version '1.0.1'
+    alias libs.plugins.licenser
 }
 
-repositories {
-    mavenCentral()
-}
+java.toolchain.languageVersion = JavaLanguageVersion.of 8
 
 license {
     header rootProject.file('../LICENSE-header.txt')
@@ -14,7 +12,5 @@ license {
 
 dependencies {
     implementation gradleApi()
-    implementation 'org.ow2.asm:asm:9.7.1'
-    implementation 'org.ow2.asm:asm-tree:9.7.1'
-    implementation 'org.ow2.asm:asm-util:9.7.1'
+    implementation libs.bundles.asm
 }

buildSrc/settings.gradle

@@ -0,0 +1,18 @@
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+    }
+
+    versionCatalogs.register('libs') {
+        plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0'
+
+        // Used to generate a Java 1 compatible class file
+        version 'asm', '9.7.1'
+        library 'asm',      'org.ow2.asm', 'asm'      versionRef 'asm'
+        library 'asm-tree', 'org.ow2.asm', 'asm-tree' versionRef 'asm'
+        library 'asm-util', 'org.ow2.asm', 'asm-util' versionRef 'asm'
+        bundle 'asm', ['asm', 'asm-tree', 'asm-util']
+    }
+}
+
+rootProject.name = 'java-version'

buildSrc/src/main/java/buildsrc/ClassGeneratorTask.java

@@ -5,30 +5,33 @@
 package buildsrc;
 
 import org.gradle.api.DefaultTask;
+import org.gradle.api.file.ProjectLayout;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.MethodVisitor;
+
+import javax.inject.Inject;
+
 import static org.objectweb.asm.Opcodes.*;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 
-abstract class ClassGeneratorTask extends DefaultTask {
+public abstract class ClassGeneratorTask extends DefaultTask {
     @OutputFile
-    abstract RegularFileProperty getOutputFile();
+    public abstract RegularFileProperty getOutputFile();
+
+    @Inject
+    protected abstract ProjectLayout getLayout();
 
     public ClassGeneratorTask() {
-        // I don't think this is necessary, as the build cache should use the hash of this compiled class as the cache key
-        // But just in case, this is how to make it always run.
-        this.getOutputs().upToDateWhen(t -> false);
-        this.getOutputFile().convention(this.getProject()
-            .getLayout()
+        this.getOutputFile().convention(this.getLayout()
             .getBuildDirectory()
             .file(this.getName() + "/JavaProbe.class")
         );

gradle.properties

@@ -0,0 +1,7 @@
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.configureondemand=true
+
+# TODO [MCMaven][Gradle9] Enable
+#org.gradle.configuration-cache=true
+#org.gradle.configuration-cache.parallel=true

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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
@@ -112,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.
@@ -203,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-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.
 
 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.