re-added mod resources publishing

Author: Wilyicaro

.github/workflows/beta.yml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          21,    # Current Java LTS
+          25,    # Current Java LTS
         ]
     runs-on: ubuntu-22.04
     steps:
@@ -28,9 +28,8 @@ jobs:
       - name: make gradle wrapper executable
         run: chmod +x ./gradlew
       - name: build
-        run: ./gradlew build
+        run: ./gradlew buildAndCollect
       - name: capture build artifacts
-        if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts

build-logic/build.gradle.kts

@@ -28,4 +28,5 @@ dependencies {
 	implementation(libs.mod.publish.plugin)
 	implementation(libs.foojay.resolver)
 	implementation(libs.fletching.table)
+	implementation(libs.vanniktech.maven.publish)
 }

build-logic/src/main/kotlin/ModPlatformPlugin.kt

@@ -1,5 +1,6 @@
 @file:Suppress("unused", "DuplicatedCode")
 
+import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import dev.kikugie.fletching_table.extension.FletchingTableExtension
 import dev.kikugie.stonecutter.build.StonecutterBuildExtension
 import me.modmuss50.mpp.ModPublishExtension
@@ -12,6 +13,7 @@ import org.gradle.api.artifacts.dsl.RepositoryHandler
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.provider.Property
+import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.tasks.Copy
 import org.gradle.internal.extensions.stdlib.toDefaultLowerCase
 import org.gradle.jvm.tasks.Jar
@@ -22,7 +24,6 @@ import org.gradle.plugins.ide.idea.model.IdeaModel
 import java.io.File
 import java.util.*
 import javax.inject.Inject
-import kotlin.text.substringAfterLast
 
 fun Project.prop(name: String): String = (findProperty(name) ?: "") as String
 
@@ -92,7 +93,8 @@ abstract class ModPlatformPlugin @Inject constructor() : Plugin<Project> {
 		listOf(
 			"org.jetbrains.kotlin.jvm",
 			"com.google.devtools.ksp",
-			"dev.kikugie.fletching-table"
+			"dev.kikugie.fletching-table",
+			"com.vanniktech.maven.publish",
 		).forEach { apply(plugin = it) }
 
 		afterEvaluate {
@@ -131,8 +133,8 @@ abstract class ModPlatformPlugin @Inject constructor() : Plugin<Project> {
 		configureJarTask(modId, prop("archives_base_name"), loader)
 		configureIdea()
 		configureProcessResources(stonecutter, isFabric, isNeoForge, isForge, modId, modVersion, mcVersion, extension, extension.requiredJava.get())
-		registerBuildAndCollectTask(extension, "$modVersion$channelTag")
-		configurePublishing(extension, loader, stonecutter, "$modVersion$channelTag", channelTag, version.toString())
+		registerBuildAndCollectTask(extension, modVersion)
+		configurePublishing(extension, loader, stonecutter, modVersion, channelTag, version.toString())
 	}
 
 	private fun Project.configureJarTask(modId: String, archivesBaseName: String, loader: String) {
@@ -279,7 +281,7 @@ abstract class ModPlatformPlugin @Inject constructor() : Plugin<Project> {
 	private fun Project.configureJava(stonecutter: StonecutterBuildExtension, requiredJava: JavaVersion) {
 		extensions.configure<JavaPluginExtension>("java") {
 			withSourcesJar()
-			withJavadocJar()
+			//withJavadocJar()
 			toolchain.languageVersion = JavaLanguageVersion.of(requiredJava.majorVersion)
 			sourceCompatibility = requiredJava
 			targetCompatibility = requiredJava
@@ -388,12 +390,7 @@ abstract class ModPlatformPlugin @Inject constructor() : Plugin<Project> {
 				dryRun = true
 			}
 
-			val isForge = false
-			val targetName = if(isForge) {
-				"reobfJar"
-			} else {
-				ext.jarTask.get()
-			}
+			val targetName = ext.jarTask.get()
 
 			val jarTask = tasks.named(targetName).map { it as Jar }
 			val srcJarTask = tasks.named(ext.sourcesJarTask.get()).map { it as Jar }
@@ -412,6 +409,51 @@ abstract class ModPlatformPlugin @Inject constructor() : Plugin<Project> {
 			modrinth(deps, currentVersion, additionalVersions, mrStaging, modrinthAccessToken)
 			if (!mrStaging) curseforge(deps, currentVersion, additionalVersions, false, curseforgeAccessToken)
 		}
+
+		extensions.configure<MavenPublishBaseExtension>("mavenPublishing") {
+			coordinates(groupId = prop("maven_group"), artifactId = "${prop("mod_id")}-${loader}", version = "${stonecutter.current.version}-${modVersion}")
+
+			pom {
+				name = "${prop("mod_name")} [${loader.replaceFirstChar(Char::titlecase)}]"
+				description = prop("mod_description")
+				url = prop("mod_source")
+				scm {
+					url = prop("mod_source")
+					connection = prop("mod_source").replace("https", "scm:git:git") + ".git"
+					developerConnection = prop("mod_source").replace("https://github.com/", "scm:git:git@github.com:") + ".git"
+				}
+				issueManagement {
+					system = "github"
+					url = prop("mod_issues")
+				}
+				licenses {
+					license {
+						name = "MPL-2"
+						url = "https://www.mozilla.org/en-US/MPL/2.0/"
+					}
+				}
+				developers {
+					developer {
+						id = prop("mod_authors").toDefaultLowerCase()
+						name = prop("mod_authors")
+					}
+				}
+			}
+		}
+		extensions.configure<PublishingExtension>("publishing") {
+			repositories {
+				maven {
+					repositories {
+						maven {
+							name = "ModResources"
+							val modResourcesURL = project.findProperty("MOD_RESOURCES") ?: System.getenv("MOD_RESOURCES")
+							if (modResourcesURL != null)
+								url = uri(modResourcesURL)
+						}
+					}
+				}
+			}
+		}
 	}
 
 	fun whenNotNull(stringProp: Property<String>, action: (String) -> Unit) {

gradle/libs.versions.toml

@@ -12,13 +12,14 @@ devtools-ksp = "2.2.10-2.0.2"
 kotlin-jvm = "2.2.10"
 fletching-table = "0.1.0-alpha.22"
 moulberry-mixinconstraints = "1.1.0"
-vanniktech-maven-publish = "0.35.0"
+vanniktech-maven-publish = "0.36.0"
 mixin = "0.8.7"
 
 [libraries]
 kikugie-postprocess = { module = "dev.kikugie:postprocess", version.ref = "stonecutter-postprocess" }
 mod-publish-plugin = { module = "me.modmuss50:mod-publish-plugin", version.ref = "mod-publish" }
 kikugie-stonecutter = { module = "dev.kikugie:stonecutter", version.ref = "stonecutter" }
+vanniktech-maven-publish = { module = "com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin", version.ref = "vanniktech-maven-publish"}
 fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
 foojay-resolver = { module = "org.gradle.toolchains:foojay-resolver", version.ref = "foojay" }
 fletching-table = { module = "dev.kikugie:fletching-table", version.ref = "fletching-table" }
@@ -32,6 +33,7 @@ fabricmc-loom = { id = "net.fabricmc.fabric-loom", version.ref = "fabric-loom" }
 neoforged-moddev = { id = "net.neoforged.moddev", version.ref = "neoforge-moddev" }
 jsonlang-postprocess = { id = "dev.kikugie.postprocess.jsonlang", version.ref = "stonecutter-postprocess" }
 mod-publish-plugin = { id = "me.modmuss50.mod-publish-plugin", version.ref = "mod-publish" }
+vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-maven-publish"}
 devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "devtools-ksp" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-jvm" }
 fletching-table = { id = "dev.kikugie.fletching-table", version.ref = "fletching-table" }

stonecutter.gradle.kts

@@ -9,6 +9,7 @@ plugins {
     alias(libs.plugins.devtools.ksp).apply(false)
     alias(libs.plugins.fletching.table).apply(false)
     alias(libs.plugins.legacyforge.moddev).apply(false)
+    alias(libs.plugins.vanniktech.maven.publish).apply(false)
 }
 
 stonecutter active file(".sc_active_version")