Bump minimum Gradle to 9.2.0

Author: Jonathing

build.gradle

@@ -8,8 +8,7 @@ plugins {
     id 'idea'
     id 'eclipse'
     id 'maven-publish'
-    id 'io.freefair.javadoc-links'
-    id 'net.minecraftforge.gradleutils'
+    alias libs.plugins.gradleutils
     alias libs.plugins.gitversion
     alias libs.plugins.changelog
     alias libs.plugins.licenser
@@ -22,6 +21,8 @@ description = "Forge's Gradle plugin to initialize and streamline the developmen
 group = 'net.minecraftforge'
 version = gitversion.tagOffset
 
+println "Version: $version"
+
 java {
     toolchain.languageVersion = JavaLanguageVersion.of(17)
     withSourcesJar()
@@ -53,10 +54,6 @@ license {
     exclude '**/*.properties'
 }
 
-tasks.withType(GroovyCompile).configureEach {
-    groovyOptions.optimizationOptions.indy = true
-}
-
 tasks.named('jar', Jar) {
     archiveClassifier = 'thin'
 }
@@ -79,7 +76,7 @@ gradlePlugin {
     website = gitversion.url
     vcsUrl = gitversion.url + '.git'
 
-    plugins.register('jarjar') {
+    plugins.register('forgedev') {
         id = 'net.minecraftforge.forgedev'
         implementationClass = 'net.minecraftforge.forgedev.ForgeDevPlugin'
         displayName = gradleutils.displayName.get()

gradle.properties

@@ -10,5 +10,3 @@ systemProp.org.gradle.unsafe.suppress-gradle-api=true
 
 net.minecraftforge.gradleutils.ide.automatic.sources=true
 net.minecraftforge.gradleutils.compilation.defaults=true
-
-net.minecraftforge.gitversion.log.version=true

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

gradlew

@@ -1,51 +1,51 @@
 plugins {
     id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
-
-    // NOTE: We need to load this into the classpath before GradleUtils for the service to load correctly
-    id 'io.freefair.javadoc-links' version '8.14' apply false // https://plugins.gradle.org/plugin/io.freefair.javadoc-links
-
-    id 'net.minecraftforge.gradleutils' version '3.3.3' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
 }
 
 rootProject.name = 'forgedev'
 
-dependencyResolutionManagement {
-    repositories {
-        mavenCentral()
-        maven gradleutils.forgeMaven
-        maven { url = 'https://maven.moddinglegacy.com/maven' } // Gradle API
-        //mavenLocal()
+// Applying plugins causes them to not have any IDE support when also applied to any build.gradle files
+// The workaround for now is to use this listener here so that it can stay in settings.gradle
+// See: https://youtrack.jetbrains.com/issue/IDEA-332061/Gradle-Missing-Code-Completion-Suggestions-for-Settings-Plugins-in-Groovy-DSL
+gradle.beforeProject { Project project ->
+    project.pluginManager.withPlugin('net.minecraftforge.gradleutils') {
+        project.repositories {
+            mavenCentral()
+            gradlePluginPortal()
+            maven project.gradleutils.forgeMaven
+            //mavenLocal()
+        }
     }
+}
 
-    //@formatter:off
-    versionCatalogs.register('libs') {
-        plugin 'licenser',       'net.minecraftforge.licenser'   version '1.2.0' // https://plugins.gradle.org/plugin/net.minecraftforge.licenser
-        plugin 'gitversion',     'net.minecraftforge.gitversion' version '3.1.0' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
-        plugin 'changelog',      'net.minecraftforge.changelog'  version '3.1.1' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
-        plugin 'plugin-publish', 'com.gradle.plugin-publish'     version '2.0.0' // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-        plugin 'shadow',         'com.gradleup.shadow'           version '9.1.0' // https://plugins.gradle.org/plugin/com.gradleup.shadow
-
-        // Static Analysis
-        library 'nulls', 'org.jetbrains', 'annotations' version '26.0.2'
-
-        // Gradle API
-        // TODO [ForgeGradle][FG7][Gradle Api] REMOVE once Gradle publish their own API artifacts
-        // Original:  https://github.com/remal-gradle-api/packages/packages/760197
-        // Mirror:    https://maven.moddinglegacy.com/#browse/browse:maven-public:name%2Fremal%2Fgradle-api%2Fgradle-api%2F8.14.1
-        version 'gradle', '9.0.0'
-        library 'gradle', 'name.remal.gradle-api', 'gradle-api'  versionRef 'gradle'
-
-        // GradleUtils Shared Base
-        library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' version '3.3.3'
-
-        library 'srgutils',  'net.minecraftforge', 'srgutils'   version '0.5.14'
-        library 'fastcsv',   'de.siegmar',         'fastcsv'    version '3.7.0'
-
-        library 'utils-data',     'net.minecraftforge', 'json-data-utils' version '0.2.1' // https://files.minecraftforge.net/net/minecraftforge/json-data-utils/index.html
-        library 'utils-hash',     'net.minecraftforge', 'hash-utils'      version '0.1.9' // https://files.minecraftforge.net/net/minecraftforge/hash-utils/index.html
-        library 'utils-download', 'net.minecraftforge', 'download-utils'  version '0.3.1' // https://files.minecraftforge.net/net/minecraftforge/download-utils/index.html
-        library 'utils-files',    'net.minecraftforge', 'file-utils'      version '0.3.1' // https://files.minecraftforge.net/net/minecraftforge/download-utils/index.html
-        bundle 'utils', ['utils-data', 'utils-hash', 'utils-download', 'utils-files']
-    }
-    //@formatter:on
+//@formatter:off
+dependencyResolutionManagement.versionCatalogs.register('libs') {
+    version 'gradleutils', '3.3.21'
+
+    plugin 'licenser',       'net.minecraftforge.licenser'    version '1.2.0'
+    plugin 'gradleutils',    'net.minecraftforge.gradleutils' versionRef 'gradleutils'
+    plugin 'gitversion',     'net.minecraftforge.gitversion'  version '3.1.6'
+    plugin 'changelog',      'net.minecraftforge.changelog'   version '3.1.3'
+    plugin 'plugin-publish', 'com.gradle.plugin-publish'      version '2.0.0'
+    plugin 'shadow',         'com.gradleup.shadow'            version '9.2.2'
+
+    // Static Analysis
+    library 'nulls', 'org.jetbrains', 'annotations' version '26.0.2-1'
+
+    // Gradle API
+    version 'gradle', '9.2.0'
+    library 'gradle', 'name.remal.gradle-api', 'gradle-api'  versionRef 'gradle'
+
+    // GradleUtils Shared Base
+    library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' versionRef 'gradleutils'
+
+    library 'srgutils',  'net.minecraftforge', 'srgutils'   version '0.5.14'
+    library 'fastcsv',   'de.siegmar',         'fastcsv'    version '3.7.0'
+
+    library 'utils-data',     'net.minecraftforge', 'json-data-utils' version '0.2.1' // https://files.minecraftforge.net/net/minecraftforge/json-data-utils/index.html
+    library 'utils-hash',     'net.minecraftforge', 'hash-utils'      version '0.1.9' // https://files.minecraftforge.net/net/minecraftforge/hash-utils/index.html
+    library 'utils-download', 'net.minecraftforge', 'download-utils'  version '0.3.1' // https://files.minecraftforge.net/net/minecraftforge/download-utils/index.html
+    library 'utils-files',    'net.minecraftforge', 'file-utils'      version '0.3.1' // https://files.minecraftforge.net/net/minecraftforge/download-utils/index.html
+    bundle 'utils', ['utils-data', 'utils-hash', 'utils-download', 'utils-files']
 }
+//@formatter:on

settings.gradle

@@ -6,6 +6,8 @@
 
 /// The package-private constants used throughout ForgeGradle.
 final class Constants {
+    private Constants() { }
+
     static final String FORGE_MAVEN = "https://maven.minecraftforge.net/";
     static final String MAVEN_CENTRAL = "https://repo1.maven.org/maven2/";
 

src/main/groovy/net/minecraftforge/forgedev/Constants.java

@@ -4,7 +4,6 @@
  */
 package net.minecraftforge.forgedev;
 
-import groovy.lang.Closure;
 import net.minecraftforge.forgedev.tasks.compat.LegacyExtractZip;
 import net.minecraftforge.forgedev.tasks.compat.LegacyMergeFilesTask;
 import net.minecraftforge.forgedev.tasks.filtering.LegacyFilterNewJar;
@@ -22,8 +21,7 @@
 import net.minecraftforge.forgedev.tasks.patching.diff.GeneratePatches;
 import net.minecraftforge.forgedev.tasks.srg2source.ApplyRangeMap;
 import net.minecraftforge.forgedev.tasks.srg2source.ExtractRangeMap;
-import net.minecraftforge.gradleutils.shared.Closures;
-import net.minecraftforge.util.data.json.PatcherConfig;
+import org.gradle.api.Action;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 import org.gradle.api.file.Directory;
@@ -47,6 +45,7 @@
 import java.nio.file.Files;
 import java.util.function.Function;
 
+// TODO [ForgeDev] Hide this and make a public interface
 @VisibleForTesting
 public abstract class ForgeDevExtension {
     public static final String NAME = "forgedev";
@@ -66,12 +65,11 @@ public ForgeDevExtension(ForgeDevPlugin plugin, Project project) {
     }
 
     // NOTE: Pass into RepositoryHandler#maven
-    @SuppressWarnings("rawtypes")
-    public Closure getMaven() {
-        return Closures.<MavenArtifactRepository>consumer(repo -> {
-            repo.setName("ForgeDevMaven");
+    public Action<? super MavenArtifactRepository> getMavenizer() {
+        return repo -> {
+            repo.setName("Mavenizer");
             repo.setUrl(this.mavenizerRepo);
-        });
+        };
     }
 
     @VisibleForTesting
@@ -82,8 +80,8 @@ public DirectoryProperty getMavenizerRepo() {
     private void setup(ForgeDevPlugin plugin, Project project) {
         var tasks = project.getTasks();
 
-        var legacyPatcher = project.getExtensions().create("patcher", LegacyPatcherExtension.class);
-        var legacyMcp = project.getExtensions().create("mcp", LegacyMCPExtension.class);
+        var legacyPatcher = project.getExtensions().create(LegacyPatcherExtension.EXTENSION_NAME, LegacyPatcherExtension.class);
+        var legacyMcp = project.getExtensions().create(LegacyMCPExtension.EXTENSION_NAME, LegacyMCPExtension.class);
         var java = project.getExtensions().getByType(JavaPluginExtension.class);
 
         var jar = tasks.named(JavaPlugin.JAR_TASK_NAME, Jar.class);