Update buildscript to use external Gradle API (#1002)

I've confirmed all publish artifacts to be identical to the original (with the exception of nullable annotations).

- The workspace is in Gradle 9.2.0 now, but uses an external Gradle 8.1 API dependency to target.
- Cleaned up the dependency tree. There is no need to exclude ASM from all dependencies.
- Switched nulls to JetBrains for consistency.
- Don't apply the plugin publish plugin as we are not publishing ForgeGradle 6.0 to the Plugin Portal.

Author: Jonathing

build.gradle

@@ -1,126 +1,172 @@
 plugins {
     id 'java-gradle-plugin'
+    id 'idea'
     id 'eclipse'
     id 'maven-publish'
-    id 'net.minecraftforge.licenser' version '1.0.1'
-    id 'net.minecraftforge.gradleutils' version '[2.3,2.4)'
-    id 'com.github.ben-manes.versions' version '0.46.0'
+    alias libs.plugins.gradleutils
+    alias libs.plugins.gitversion
+    alias libs.plugins.changelog
+    alias libs.plugins.licenser
 }
 
-version = gradleutils.getTagOffsetBranchVersion('FG_6.0')
-logger.lifecycle('Version: ' + version + ' Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
+gradleutils.displayName = 'ForgeGradle'
+description = "Forge's Gradle plugin for Mod development"
+group = 'net.minecraftforge.gradle'
+version = gitversion.tagOffset
 
-changelog {
-    from '6.0'
-    publishAll = false
-}
-sourceSets {
-    common
-    mcp
-    patcher
-    userdev
-}
+println "Version: $version"
 
 java {
     toolchain.languageVersion = JavaLanguageVersion.of(8)
     withSourcesJar()
 }
 
-configurations {
-    configureEach {
-        exclude group: 'org.ow2.asm'
+sourceSets {
+    register('common')
+
+    register('mcp') {
+        configurations.named(implementationConfigurationName) {
+            extendsFrom configurations.getByName(common.implementationConfigurationName)
+        }
+
+        configurations.named(compileOnlyConfigurationName) {
+            extendsFrom configurations.getByName(common.compileOnlyConfigurationName)
+        }
     }
-    mcpImplementation.extendsFrom commonImplementation
-    patcherImplementation.extendsFrom commonImplementation
-    userdevImplementation.extendsFrom mcpImplementation
-    implementation.extendsFrom mcpImplementation, patcherImplementation, userdevImplementation
-}
 
-tasks.named('jar', Jar).configure {
-    from sourceSets.common.output
-    from sourceSets.mcp.output
-    from sourceSets.patcher.output
-    from sourceSets.userdev.output
-}
+    register('patcher') {
+        configurations.named(implementationConfigurationName) {
+            extendsFrom configurations.getByName(common.implementationConfigurationName)
+        }
 
-tasks.named('sourcesJar', Jar).configure {
-    from sourceSets.common.allJava
-    from sourceSets.mcp.allJava
-    from sourceSets.patcher.allJava
-    from sourceSets.userdev.allJava
-}
+        configurations.named(compileOnlyConfigurationName) {
+            extendsFrom configurations.getByName(common.compileOnlyConfigurationName)
+        }
+    }
 
-repositories {
-    mavenLocal()
-    maven gradleutils.forgeMaven
-}
+    register('userdev') {
+        configurations.named(implementationConfigurationName) {
+            extendsFrom configurations.getByName(mcp.implementationConfigurationName)
+        }
 
-license {
-    header = file('HEADER')
-    exclude '**/*.properties'
-    exclude 'net/minecraftforge/gradle/common/diff/'
-    exclude 'net/minecraftforge/gradle/common/util/JavaVersionParser.java'
-}
+        configurations.named(compileOnlyConfigurationName) {
+            extendsFrom configurations.getByName(mcp.compileOnlyConfigurationName)
+        }
+    }
+
+    named('main') {
+        configurations.named(implementationConfigurationName) {
+            extendsFrom(
+                configurations.getByName(mcp.implementationConfigurationName),
+                configurations.getByName(patcher.implementationConfigurationName),
+                configurations.getByName(userdev.implementationConfigurationName),
+            )
+        }
 
-tasks.named('wrapper', Wrapper).configure {
-    gradleVersion = '8.4'
-    distributionType = Wrapper.DistributionType.ALL
+        configurations.named(compileOnlyConfigurationName) {
+            extendsFrom(
+                configurations.getByName(mcp.compileOnlyConfigurationName),
+                configurations.getByName(patcher.compileOnlyConfigurationName),
+                configurations.getByName(userdev.compileOnlyConfigurationName),
+            )
+        }
+    }
 }
 
 dependencies {
-    commonImplementation gradleApi()
-    commonImplementation 'commons-io:commons-io:2.11.0'
-    commonImplementation 'com.google.code.gson:gson:2.10.1'
-    commonImplementation 'com.google.guava:guava:31.1-jre'
-    commonImplementation 'de.siegmar:fastcsv:2.2.1'
-    commonImplementation('net.minecraftforge:artifactural:3.0.20') {
+    commonCompileOnly libs.nulls
+
+    commonCompileOnly libs.gradle
+
+    commonImplementation libs.commons.io
+    commonImplementation libs.gson
+    commonImplementation libs.guava
+    commonImplementation libs.fastcsv
+    commonImplementation(libs.artifactural) {
         transitive = false
     }
-    commonImplementation('net.minecraftforge:unsafe:0.2.0') {
+    commonImplementation(libs.unsafe) {
         transitive = false
     }
-    commonImplementation 'org.apache.maven:maven-artifact:3.9.1'
-    commonImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    commonImplementation 'net.minecraftforge:srgutils:0.5.10'
-    commonImplementation 'net.minecraftforge:DiffPatch:2.0.12:all'
+    commonImplementation libs.maven.artifact
+    commonImplementation libs.httpclient
+    commonImplementation libs.srgutils
+    commonImplementation variantOf(libs.diffpatch) { classifier 'all' }
 
     mcpImplementation sourceSets.common.output
     patcherImplementation sourceSets.mcp.output
     patcherImplementation sourceSets.common.output
     userdevImplementation sourceSets.mcp.output
     userdevImplementation sourceSets.common.output
 
-    userdevImplementation 'net.minecraftforge:JarJarMetadata:0.3.19'
-    userdevImplementation 'net.minecraftforge:JarJarSelector:0.3.19'
+    userdevImplementation libs.jarjar.metadata
+    userdevImplementation libs.jarjar.selector
+}
+
+license {
+    header = rootProject.file('HEADER')
+    exclude '**/*.properties'
+    exclude 'net/minecraftforge/gradle/common/diff/'
+    exclude 'net/minecraftforge/gradle/common/util/JavaVersionParser.java'
+}
+
+tasks.named('jar', Jar) {
+    from sourceSets.common.output
+    from sourceSets.mcp.output
+    from sourceSets.patcher.output
+    from sourceSets.userdev.output
+}
+
+tasks.named('sourcesJar', Jar) {
+    from sourceSets.common.allJava
+    from sourceSets.mcp.allJava
+    from sourceSets.patcher.allJava
+    from sourceSets.userdev.allJava
+}
+
+changelog {
+    from '6.0'
 }
 
 gradlePlugin {
+    website = gitversion.url
+    vcsUrl = gitversion.url + '.git'
+
     plugins {
-        mcp {
+        register('mcp') {
             id = 'net.minecraftforge.gradle.mcp'
             implementationClass = 'net.minecraftforge.gradle.mcp.MCPPlugin'
         }
-        patcher {
+
+        register('patcher') {
             id = 'net.minecraftforge.gradle.patcher'
             implementationClass = 'net.minecraftforge.gradle.patcher.PatcherPlugin'
         }
-        userdev {
+
+        register('userdev') {
             id = 'net.minecraftforge.gradle'
             implementationClass = 'net.minecraftforge.gradle.userdev.UserDevPlugin'
+            displayName = gradleutils.displayName.get()
+            description = project.description
+            tags = ['minecraftforge', 'minecraft']
         }
     }
-    automatedPublishing = true
 }
 
 publishing {
-    publications {
-        pluginMaven(MavenPublication) {
-            // Automated publishing declares the java component for us
+    repositories {
+        maven gradleutils.publishingForgeMaven
+    }
 
-            project.changelog.publish(it)
+    publications.register('pluginMaven', MavenPublication) {
+        changelog.publish(it)
+        gradleutils.promote(it)
+
+        pom { pom ->
+            name = gradleutils.displayName
+            description = project.description
+
+            gradleutils.pom.addRemoteDetails(pom)
         }
     }
-    repositories {
-        maven gradleutils.getPublishingForgeMaven()
-    }
 }

gradle.properties

@@ -1 +1,12 @@
-group=net.minecraftforge.gradle
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.configureondemand=true
+
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true
+org.gradle.configuration-cache.problems=warn
+
+systemProp.org.gradle.unsafe.suppress-gradle-api=true
+
+net.minecraftforge.gradleutils.ide.automatic.sources=true
+net.minecraftforge.gradleutils.compilation.defaults=true

gradle/wrapper/gradle-wrapper.properties

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