Update buildscript

Author: Jonathing

build.gradle

@@ -3,25 +3,28 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 plugins {
     id 'java'
     id 'idea'
+    id 'eclipse'
     id 'maven-publish'
-    alias libs.plugins.licenser
     alias libs.plugins.gradleutils
+    alias libs.plugins.gitversion
+    alias libs.plugins.changelog
+    alias libs.plugins.licenser
     alias libs.plugins.shadow
-    //alias libs.plugins.modules
 }
 
-final projectDisplayName = 'Minecraft Mavenizer'
-final projectArtifactId = base.archivesName = 'minecraft-mavenizer'
-final projectVendor = 'Forge Development LLC'
+gradleutils.displayName = 'Minecraft Mavenizer'
 description = 'A pure-blooded Java tool to generate a maven repository for Minecraft artifacts.'
 group = 'net.minecraftforge'
 version = gitversion.tagOffset
 
 println "Version: $version"
 
+// TODO [Mavenizer] Update to Java 25 once ForgeGradle and ForgeDev target Gradle 9.1.0
 java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 dependencies {
+    compileOnly libs.nulls
+
     implementation libs.jopt
     implementation libs.gson
     implementation libs.jver
@@ -32,20 +35,8 @@ dependencies {
     implementation libs.commonsio
 
     implementation libs.bundles.utils
-
-    // Static Analysis
-    compileOnly libs.nulls
 }
 
-/* Can't do modules yet with JavaProvisioner having JavaProbe in the root package.
-extraJavaModuleInfo {
-    failOnMissingModuleInfo = false
-    //skipLocalJars = true
-
-    automaticModule(libs.diff, 'io.codechicken.diffpatch')
-}
-*/
-
 license {
     header = rootProject.file('LICENSE-header.txt')
     newLine false
@@ -55,17 +46,11 @@ license {
 tasks.named('jar', Jar) {
     manifest {
         attributes([
-            'Main-Class': 'net.minecraftforge.mcmaven.cli.Main',
+            'Main-Class'           : 'net.minecraftforge.mcmaven.cli.Main',
             'Automatic-Module-Name': 'net.minecraftforge.mavenizer'
         ])
-        attributes([
-            'Specification-Title'   : projectDisplayName,
-            'Specification-Vendor'  : projectVendor,
-            'Specification-Version' : gitversion.info.tag,
-            'Implementation-Title'  : projectDisplayName,
-            'Implementation-Vendor' : projectVendor,
-            'Implementation-Version': project.version
-        ], 'net/minecraftforge/mcmaven/cli/')
+
+        gradleutils.manifestDefaults(it, 'net/minecraftforge/mcmaven/cli/')
     }
 
     archiveClassifier = 'slim'
@@ -75,28 +60,26 @@ tasks.named('shadowJar', ShadowJar) {
     archiveClassifier = ''
 }
 
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8'
-    options.compilerArgs.addAll(['--module-version', project.version]);
-}
-
 changelog {
     fromBase()
-    publishAll = false
 }
 
 publishing {
+    repositories {
+        maven gradleutils.publishingForgeMaven
+    }
+
     publications.register('mavenJava', MavenPublication) {
         from components.shadow
 
-        artifactId = projectArtifactId
-        changelog.publish it
+        changelog.publish(it)
+        gradleutils.promote(it)
 
         pom { pom ->
-            name = projectDisplayName
+            name = gradleutils.displayName
             description = project.description
 
-            gradleutils.pom.setGitHubDetails pom
+            gradleutils.pom.addRemoteDetails(pom)
 
             licenses {
                 license gradleutils.pom.licenses.LGPLv2_1
@@ -108,10 +91,4 @@ publishing {
             }
         }
     }
-
-    repositories {
-        maven gradleutils.publishingForgeMaven
-    }
 }
-
-idea.module { downloadSources = downloadJavadoc = true }

gradle.properties

@@ -2,6 +2,9 @@ org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 
-# TODO [MCMavenizer][Gradle9] Enable
-#org.gradle.configuration-cache=true
-#org.gradle.configuration-cache.parallel=true
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true
+org.gradle.configuration-cache.problems=warn
+
+net.minecraftforge.gradleutils.ide.automatic.sources=true
+net.minecraftforge.gradleutils.compilation.defaults=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.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -205,7 +205,7 @@ 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.

gradlew

@@ -1,21 +1,33 @@
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 
 rootProject.name = 'minecraft-mavenizer'
 
-dependencyResolutionManagement {
-    repositories {
-        maven { url = 'https://maven.minecraftforge.net/' }
-        mavenCentral()
+// 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()
+            maven project.gradleutils.forgeMaven
+            //mavenLocal()
+        }
     }
+}
 
+dependencyResolutionManagement {
     //@formatter:off
     versionCatalogs.register('libs') {
-        plugin 'licenser',    'net.minecraftforge.licenser'        version '1.2.0'
-        plugin 'gradleutils', 'net.minecraftforge.gradleutils'     version '2.6.0'
-        plugin 'shadow',      'com.gradleup.shadow'                version '9.0.0-beta13'
-        plugin 'modules',     'org.gradlex.extra-java-module-info' version '1.12'
+        plugin 'licenser',    'net.minecraftforge.licenser'    version '1.2.0'
+        plugin 'gradleutils', 'net.minecraftforge.gradleutils' version '3.3.18'
+        plugin 'gitversion',  'net.minecraftforge.gitversion'  version '3.1.1'
+        plugin 'changelog',   'net.minecraftforge.changelog'   version '3.1.2'
+        plugin 'shadow',      'com.gradleup.shadow'            version '9.2.2'
+
+        // Static Analysis
+        library 'nulls', 'org.jetbrains', 'annotations' version '26.0.2'
 
         library 'gson',     'com.google.code.gson', 'gson'             version '2.10.1'
         library 'jopt',     'net.sf.jopt-simple',   'jopt-simple'      version '6.0-alpha-3'
@@ -33,9 +45,6 @@ dependencyResolutionManagement {
         library 'utils-data',     'net.minecraftforge', 'json-data-utils' version '0.2.3'
         library 'utils-logging',  'net.minecraftforge', 'log-utils'       version '0.3.1'
         bundle 'utils', ['utils-download', 'utils-files', 'utils-hash', 'utils-data', 'utils-logging']
-
-        // Static Analysis
-        library 'nulls', 'org.jetbrains', 'annotations' version '26.0.2'
     }
     //@formatter:on
 }