build: Update publishing

Author: jpenilla

.github/workflows/build.yml

@@ -37,13 +37,13 @@ jobs:
                   fi
             - name: Publish Snapshot
               if: "${{ env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/master' }}"
-              run: ./gradlew publish
+              run: ./gradlew publishAllPublicationsToSonatypeSnapshots
               env:
                   ORG_GRADLE_PROJECT_sonatypeUsername: "${{ secrets.SONATYPE_USERNAME }}"
                   ORG_GRADLE_PROJECT_sonatypePassword: "${{ secrets.SONATYPE_PASSWORD }}"
             - name: Publish Release
               if: "${{ env.STATUS == 'release' && github.event_name == 'release' }}"
-              run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
+              run: ./gradlew publishReleaseCentralPortalBundle
               env:
                   ORG_GRADLE_PROJECT_sonatypeUsername: "${{ secrets.SONATYPE_USERNAME }}"
                   ORG_GRADLE_PROJECT_sonatypePassword: "${{ secrets.SONATYPE_PASSWORD }}"

build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
-    alias(libs.plugins.cloud.buildLogic.rootProject.publishing)
+    // alias(libs.plugins.cloud.buildLogic.rootProject.publishing)
+    alias(libs.plugins.centralPublishing)
     alias(libs.plugins.cloud.buildLogic.rootProject.spotless)
 }
 
@@ -16,3 +17,10 @@ tasks {
         dependsOn(gradle.includedBuild("build-logic").task(":spotlessApply"))
     }
 }
+
+tasks.register("publish") // TODO - below makes publish dependsOn it
+centralPortalPublishing.bundle("release") {
+    username = providers.gradleProperty("sonatypeUsername")
+    password = providers.gradleProperty("sonatypePassword")
+    publishingType = "AUTOMATIC"
+}

gradle/build-logic/build.gradle.kts

@@ -15,6 +15,7 @@ dependencies {
     // loom needs this version of asm, for some reason we have an older one on the classpath without this
     implementation("org.ow2.asm:asm:9.8")
     implementation(libs.cloud.build.logic)
+    implementation(libs.centralPublishing)
 
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }

gradle/build-logic/src/main/kotlin/conventions.publishing.gradle.kts

@@ -1,8 +1,10 @@
+import dev.lukebemish.centralportalpublishing.CentralPortalRepositoryHandlerExtension
 import org.incendo.cloudbuildlogic.city
 import org.incendo.cloudbuildlogic.jmp
 
 plugins {
     id("org.incendo.cloud-build-logic.publishing")
+    id("dev.lukebemish.central-portal-publishing")
 }
 
 indra {
@@ -25,3 +27,18 @@ javadocLinks {
     override(libs.fabricLoader, "https://maven.fabricmc.net/docs/fabric-loader-{version}")
     excludes.add("net.fabricmc.fabric-api:")
 }
+
+publishing {
+    repositories {
+        val portal = (this as ExtensionAware).extensions.getByType(CentralPortalRepositoryHandlerExtension::class)
+        portal.portalBundle(":", "release")
+
+        maven("https://central.sonatype.com/repository/maven-snapshots/") {
+            name = "SonatypeSnapshots"
+            credentials(PasswordCredentials::class) {
+                username = providers.gradleProperty("sonatypeUsername").getOrElse("username")
+                password = providers.gradleProperty("sonatypePassword").getOrElse("password")
+            }
+        }
+    }
+}

gradle/libs.versions.toml

@@ -1,5 +1,6 @@
 [versions]
 cloud-build-logic = "0.0.16"
+centralPublishing = "0.1.6"
 checkstyle = "10.12.5"
 stylecheck = "0.2.1"
 ktlint = "0.50.0"
@@ -21,6 +22,7 @@ adventureMod = "6.4.0"
 
 [libraries]
 cloud-build-logic = { module = "org.incendo:cloud-build-logic", version.ref = "cloud-build-logic" }
+centralPublishing = { module = "dev.lukebemish:central-portal-publishing", version.ref = "centralPublishing" }
 stylecheck = { module = "ca.stellardrift:stylecheck", version.ref = "stylecheck" }
 errorproneCore = { group = "com.google.errorprone", name = "error_prone_core", version.ref = "errorprone" }
 
@@ -54,6 +56,7 @@ zNeoForge = { module = "net.neoforged:neoforge", version.ref = "neoforge" }
 cloud-buildLogic-spotless = { id = "org.incendo.cloud-build-logic.spotless", version.ref = "cloud-build-logic" }
 cloud-buildLogic-rootProject-publishing = { id = "org.incendo.cloud-build-logic.publishing.root-project", version.ref = "cloud-build-logic" }
 cloud-buildLogic-rootProject-spotless = { id = "org.incendo.cloud-build-logic.spotless.root-project", version.ref = "cloud-build-logic" }
+centralPublishing = { id = "dev.lukebemish.central-portal-publishing", version.ref = "centralPublishing" }
 
 [bundles]
 immutables = ["immutables", "immutablesAnnotate"]