Build ourselves using GradleUtils 3.3.18

Author: Jonathing

.github/workflows/publish.yml

@@ -2,18 +2,21 @@ name: Publish
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ 'GU_2.6' ]
+    paths-ignore:
+      - '.github/workflows/**'
+      - 'docs/**'
+      - 'README.md'
 
 permissions:
   contents: read
 
 jobs:
   build:
-    uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main
+    uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@v0
     with:
       java: 17
-      gradle_tasks: "publish publishPlugins"
-      artifact_name: "gradleutils"
+      gradle_tasks: 'check publish publishPlugins'
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
       PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}

build.gradle

@@ -1,25 +1,35 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-    id 'dev.gradleplugins.groovy-gradle-plugin'
+    id 'java-gradle-plugin'
+    id 'groovy'
     id 'idea'
     id 'eclipse'
     id 'maven-publish'
+    alias libs.plugins.versions
     alias libs.plugins.licenser
     alias libs.plugins.gradleutils
+    alias libs.plugins.gitversion
+    alias libs.plugins.changelog
     alias libs.plugins.plugin.publish
     alias libs.plugins.shadow
 }
 
-final projectDisplayName = 'Forge Gradle Utilities'
-description = 'Small collection of utilities for standardizing MinecraftForge gradle scripts'
+gradleutils.displayName = 'Forge Gradle Utilities'
+description = "Small collection of utilities for standardizing Forge's buildscripts."
 group = 'net.minecraftforge'
 version = gitversion.tagOffset
 
 println "Version: $version"
 
 // Git Version requires Java 17
-java.toolchain.languageVersion = JavaLanguageVersion.of 17
+java {
+    toolchain.languageVersion = JavaLanguageVersion.of(17)
+    withSourcesJar()
+    withJavadocJar()
+}
+
+gradleutils.pluginDevDefaults(configurations, libs.versions.gradle)
 
 configurations {
     named(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME) {
@@ -28,15 +38,16 @@ configurations {
     }
 }
 
-repositories {
-    maven { url = 'https://maven.minecraftforge.net' }
-    mavenCentral()
-}
-
 dependencies {
     // Static Analysis
     compileOnly libs.nulls
 
+    // Gradle API
+    compileOnly libs.gradle
+
+    // Versions Plugin
+    compileOnly libs.gradle.versions
+
     // GitHub Actions Workflows
     implementation libs.yaml
 
@@ -47,59 +58,55 @@ dependencies {
     implementation libs.jgit
 }
 
-// Removes local Gradle API from compileOnly. This is a workaround for bugged plugins.
-// TODO [GradleUtils][GradleAPI] Remove this once they are fixed.
-// Publish Plugin: https://github.com/gradle/plugin-portal-requests/issues/260
-// Shadow:         https://github.com/GradleUp/shadow/pull/1422
-afterEvaluate { project ->
-    project.configurations.named(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME) { compileOnly ->
-        compileOnly.dependencies.remove project.dependencies.gradleApi()
-    }
-}
-
 license {
-    header = rootProject.file 'LICENSE-header.txt'
+    header = rootProject.file('LICENSE-header.txt')
     newLine = false
     exclude '**/*.properties'
 }
 
+tasks.named('javadoc', Javadoc) {
+    // Groovydoc is used instead
+    enabled = false
+}
+
+tasks.named('groovydoc', Groovydoc) {
+    use = true
+}
+
 tasks.named('jar', Jar) {
     archiveClassifier = 'thin'
 }
 
 tasks.named('shadowJar', ShadowJar) {
-    enableRelocation = true
+    enableAutoRelocation = true
     archiveClassifier = null
     relocationPrefix = 'net.minecraftforge.gradleutils.shadow'
 }
 
-tasks.withType(GroovyCompile).configureEach {
-    groovyOptions.optimizationOptions.indy = true
+// javadocJar is created after evaluation, so we need to configure it here
+afterEvaluate {
+    tasks.named('javadocJar', Jar) {
+        final groovydoc = tasks.named('groovydoc', Groovydoc)
+
+        dependsOn = [groovydoc]
+        archiveClassifier = 'groovydoc'
+        from groovydoc.map(Groovydoc.&getDestinationDir)
+    }
 }
 
 changelog {
     fromBase()
-    publishAll = false
 }
 
 gradlePlugin {
     website.set gitversion.url
     vcsUrl.set gitversion.url + '.git'
 
-    compatibility {
-        minimumGradleVersion = libs.versions.gradle.get()
-    }
-
-    groovy {
-        withSourcesJar()
-        withGroovydocJar()
-    }
-
     plugins {
         register('gradleutils') {
             id = 'net.minecraftforge.gradleutils'
             implementationClass = 'net.minecraftforge.gradleutils.GradleUtilsPlugin'
-            displayName = projectDisplayName
+            displayName = project.gradleutils.displayName.get() // project. before gradleutils otherwise it would reference itself
             description = project.description
             tags = ['minecraftforge']
         }
@@ -114,16 +121,19 @@ gradlePlugin {
 }
 
 publishing {
-    publications.register('pluginMaven', MavenPublication) {
-        artifactId = project.name
+    repositories {
+        maven gradleutils.publishingForgeMaven
+    }
 
-        changelog.publish it
+    publications.register('pluginMaven', MavenPublication) {
+        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
@@ -138,10 +148,4 @@ publishing {
             }
         }
     }
-
-    repositories {
-        maven gradleutils.publishingForgeMaven
-    }
 }
-
-idea.module { downloadSources = downloadJavadoc = true }

gradle.properties

@@ -2,10 +2,9 @@ org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 
-# TODO [GradleUtils][Gradle9] Re-enable config cache in Gradle 9
-# Configuration Cache causes issues with plugin publishing.
-# Do continue to make our Gradle plugins (GU, FG7, etc.) support it though.
-#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
 
-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.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-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

@@ -114,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.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 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.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -1,37 +1,55 @@
-import org.gradle.api.initialization.resolve.RepositoriesMode
-
 plugins {
-    id 'dev.gradleplugins.gradle-plugin-development' version '1.9.0'
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 
 rootProject.name = 'gradleutils'
 
-dependencyResolutionManagement {
-    // Repositories are located in build.gradle for this project
-    // dev.gradleplugins.groovy-gradle-plugin is bugged and force adds repositories on the project
-    // so, we can't declare the repositories in here
-    repositoriesMode = RepositoriesMode.PREFER_PROJECT
+// 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
+            maven { url = 'https://maven.moddinglegacy.com' } // Gradle API
+            //mavenLocal()
+        }
+    }
+}
+
+//@formatter:off
+dependencyResolutionManagement.versionCatalogs.register('libs') {
+    version 'gradle-versions', '0.53.0'
 
-    versionCatalogs.register('libs') {
-        plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0'
-        plugin 'gradleutils', 'net.minecraftforge.gradleutils' version '2.5.1'
-        plugin 'plugin-publish', 'com.gradle.plugin-publish' version '1.3.1'
-        plugin 'shadow', 'com.gradleup.shadow' version '9.0.0-beta13'
+    plugin 'versions',       'com.github.ben-manes.versions'  versionRef 'gradle-versions'
+    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 'plugin-publish', 'com.gradle.plugin-publish'      version '2.0.0'
+    plugin 'shadow',         'com.gradleup.shadow'            version '9.2.2'
 
-        // Gradle API
-        version 'gradle', '7.3'
+    // Static Analysis
+    library 'nulls', 'org.jetbrains', 'annotations' version '26.0.2'
 
-        // Static Analysis
-        library 'nulls', 'org.jetbrains', 'annotations' version '26.0.2'
+    // Gradle API
+    // Original: https://github.com/remal-gradle-api/packages/packages/760197?version=7.3
+    // Mirror:   https://repos.moddinglegacy.com/#/modding-legacy/name/remal/gradle-api/gradle-api/7.3
+    version 'gradle', '7.3'
+    library 'gradle', 'name.remal.gradle-api', 'gradle-api'  versionRef 'gradle'
 
-        // GitHub Actions Workflows
-        library 'yaml', 'org.yaml', 'snakeyaml' version '2.4'
+    // Versions Plugin
+    library 'gradle-versions', 'com.github.ben-manes.versions', 'com.github.ben-manes.versions.gradle.plugin' versionRef 'gradle-versions'
 
-        // Git Version
-        library 'gitver', 'net.minecraftforge', 'gitversion' version '0.5.2'
+    // GitHub Actions Workflows
+    library 'yaml', 'org.yaml', 'snakeyaml' version '2.4'
 
-        // Backwards compatibility
-        library 'jgit', 'org.eclipse.jgit', 'org.eclipse.jgit' version '7.2.0.202503040940-r'
-    }
+    // Git Version
+    library 'gitver', 'net.minecraftforge', 'gitversion' version '0.5.2'
+
+    // Backwards compatibility
+    library 'jgit', 'org.eclipse.jgit', 'org.eclipse.jgit' version '7.2.0.202503040940-r'
 }
+//@formatter:on