Build and publish the shared base alongside main build

Author: Jonathing

.github/workflows/publish-shared.yml

@@ -4,8 +4,8 @@ on:
   push:
     branches: [ 'main' ]
     paths-ignore:
-      - 'gradleutils-shared/**'
       - '.github/workflows/**'
+      - 'docs/**'
       - 'README.md'
 
 permissions:
@@ -16,8 +16,8 @@ jobs:
     uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@v0
     with:
       java: 17
-      gradle_tasks: ':gradleutils-shared:check :check :publish :publishPlugins'
-      artifact_name: 'gradleutils'
+      gradle_tasks: ':gradleutils-shared:check :check :gradleutils-shared:publish :publish :publishPlugins'
+      artifact_name: 'gradleutils,gradleutils-shared'
     secrets:
       DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
       PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}

.github/workflows/publish.yml

@@ -10,9 +10,9 @@ plugins {
     id 'maven-publish'
     id 'io.freefair.javadoc-links'
     id 'net.minecraftforge.gradleutils'
-    alias libs.plugins.licenser
-    alias libs.plugins.gitversion
+    id 'net.minecraftforge.gitversion'
     alias libs.plugins.changelog
+    alias libs.plugins.licenser
     alias libs.plugins.plugin.publish
     alias libs.plugins.shadow
 }
@@ -21,7 +21,7 @@ final projectDisplayName = 'Forge Gradle Utilities'
 description = 'Small collection of utilities for standardizing MinecraftForge gradle scripts'
 base.archivesName = 'gradleutils'
 group = 'net.minecraftforge'
-version = gitversion.tagOffset
+// version set by gitversion in settings.gradle
 
 println "Version: $version"
 
@@ -42,7 +42,7 @@ configurations {
                 attributes {
                     attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling, Bundling.SHADOWED))
                 }
-            } because 'Project dependencies do not read the published module file, so the shadowed attribute is manually declared'
+            } because 'Project dependencies do not read the published module file, so the shadowed attribute is manually declared.'
         }
     }
 
@@ -76,7 +76,6 @@ dependencies {
 }
 
 // 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 ->
@@ -128,7 +127,7 @@ gradlePlugin {
         implementationClass = 'net.minecraftforge.gradleutils.GradleUtilsPlugin'
         displayName = projectDisplayName
         description = project.description
-        tags.set(['minecraftforge'])
+        tags = ['minecraftforge']
     }
 }
 

build.gradle

@@ -1,7 +1,7 @@
 # GradleUtils 3
 
-GradleUtils 3 is a new release of GradleUtils that includes a compete rewrite of
-the plugin, along with its components. It is now written for Java version 17 and
+GradleUtils 3 is a new release of GradleUtils that includes a complete rewrite
+of the plugin, along with its components. It is now written for Java version 17 and
 targets Gradle 9.0.0.
 
 ## Additions
@@ -89,10 +89,8 @@ publishing info.
 
 ### Plugin Application
 
-GradleUtils is no longer restricted to only plugins. It can now be applied to
-any type of `ExtensionAware`, which includes the `settings.gradle`. Projects
-that apply the plugin will now use a subset of the `gradleutils` extension that
-includes project-specific members, such as `gradleutils.pom`.
+GradleUtils is no longer restricted to only projects. It can now be applied to
+any type of `ExtensionAware`, which includes the `settings.gradle`.
 
 ### Release Maven Publishing
 

docs/releases/3.0.md

@@ -5,7 +5,7 @@ plugins. This is meant to be a tool internal to Forge, but any one case use it
 if they want.
 
 > [!NOTE]
-> The version number is intentionally shared with base GradleUtils. However, it
-> may not always be published alongside it. Check the
-> [Forge Files Site](https://files.minecraftforge.net/net/minecraftforge/gradleutils-shared/index.html)
-> for the latest version before using it.
+> The version number is intentionally shared with base GradleUtils. It will
+> always be built alongside GradleUtils, but it is not published to the Gradle
+> Plugin Portal or Maven Central, only to the Forge Maven at
+> `https://maven.minecraftforge.net`.

gradleutils-shared/README.md

@@ -10,15 +10,14 @@ plugins {
     id 'io.freefair.javadoc-links'
     id 'net.minecraftforge.gradleutils'
     alias libs.plugins.licenser
-    alias libs.plugins.gitversion
     alias libs.plugins.shadow
 }
 
 final projectDisplayName = 'Minecraft Forge Shared Plugin Base'
 base.archivesName = 'gradleutils-shared'
 description = 'The shared base used by all of Minecraft Forge\'s Gradle plugins'
 group = 'net.minecraftforge'
-version = gitversion.tagOffset
+// version set by gitversion in settings.gradle
 
 println "Version: $version"
 

gradleutils-shared/build.gradle

@@ -13,7 +13,8 @@ plugins {
     // 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.0.0-beta.20' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
+    id 'net.minecraftforge.gradleutils' version '3.0.0-beta.30' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
+    id 'net.minecraftforge.gitversion'  version '3.0.0'         // https://plugins.gradle.org/plugin/net.minecraftforge.gitversion
 }
 
 rootProject.name = 'gradleutils'
@@ -32,11 +33,10 @@ dependencyResolutionManagement {
         register('libs') {
             version 'gradle-javadoc-links', '8.14'
 
-            plugin 'licenser',       'net.minecraftforge.licenser'    version '1.2.0'         // https://plugins.gradle.org/plugin/net.minecraftforge.licenser
-            plugin 'gitversion',     'net.minecraftforge.gitversion'  version '3.0.0-beta.22' // https://plugins.gradle.org/plugin/net.minecraftforge.gitversion
-            plugin 'changelog',      'net.minecraftforge.changelog'   version '3.0.0-beta.22' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
-            plugin 'plugin-publish', 'com.gradle.plugin-publish'      version '1.3.1'         // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-            plugin 'shadow',         'com.gradleup.shadow'            version '9.0.2'         // https://plugins.gradle.org/plugin/com.gradleup.shadow
+            plugin 'licenser',       'net.minecraftforge.licenser'  version '1.2.0' // https://plugins.gradle.org/plugin/net.minecraftforge.licenser
+            plugin 'changelog',      'net.minecraftforge.changelog' version '3.0.0' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
+            plugin 'plugin-publish', 'com.gradle.plugin-publish'    version '1.3.1' // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
+            plugin 'shadow',         'com.gradleup.shadow'          version '9.0.2' // https://plugins.gradle.org/plugin/com.gradleup.shadow
 
             // Static Analysis
             library 'nulls',  'org.jetbrains', 'annotations' version '26.0.2'