migrate to Sonatype portal publisher.

atsushieno · atsushieno · commit 352c5b4166a4 · 2025-05-19T00:17:35.000+09:00
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -11,85 +11,62 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-13, macos-14]
+        os: [ubuntu-24.04, macos-13, macos-14]
     steps:
     - name: checkout
       uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: setup apt packages on Linux
-      if: matrix.os == 'ubuntu-22.04'
+      if: matrix.os == 'ubuntu-24.04'
       run: |
         sudo apt-get update
         echo y | sudo apt-get install doxygen cmake ninja-build libasound2-dev
-    - name: set up JDK 21
+    - name: set up JDK 22
       uses: actions/setup-java@v4
       with:
-        java-version: 21
+        java-version: 22
         distribution: temurin
 
-    # only for release tags
-    - name: setup gpg necessities
-      if: startsWith(github.ref, 'refs/tags/')
-      shell: bash
-      run: |
-        mkdir -p '${{ github.workspace }}'
-        echo '${{ secrets.GPG_KEY_CONTENTS }}' | base64 -d > '${{ github.workspace }}/${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}'
-    - name: rewrite build.gradle to require signing on awkward OS
-      if: startsWith(github.ref, 'refs/tags/') && contains(matrix.os, 'macos')
-      run: |
-        sed -i "" "s/signing {}/signing { sign(publishing.publications) }/" */build.gradle*
-    - name: rewrite build.gradle to require signing on standard OS
-      shell: bash
-      if: startsWith(github.ref, 'refs/tags/') && !contains(matrix.os, 'macos')
-      run: |
-        sed -i "s/signing {}/signing { sign(publishing.publications) }/" */build.gradle*
-
     # only for NON-releases on macos-13
     - name: macos-13 lightweight build with Gradle for libs
       if: ${{ !startsWith(github.ref, 'refs/tags/') && contains(matrix.os, 'macos-13') }}
       run: ./gradlew --warning-mode all publishToMavenLocal
     # only for releases on macos-13
     - name: macos-13 lightweight publish with Gradle for libs
       if: ${{ startsWith(github.ref, 'refs/tags/') && contains(matrix.os, 'macos-13') }}
-      run: ./gradlew --no-daemon --warning-mode all publishMacosX64PublicationToOSSRHRepository publishIosX64PublicationToOSSRHRepository
+      run: ./gradlew --no-daemon --warning-mode all publishMacosX64PublicationToMavenCentralRepository publishIosX64PublicationToMavenCentralRepository
       env:
-        OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-        OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-        OSSRH_STAGING_REPOSITORY_ID: ${{ needs.create_staging_repository.outputs.repository_id }}
-        SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-        SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-        SIGNING_SECRET_KEY_RING_FILE: ${{ format('{0}/{1}', github.workspace, secrets.SIGNING_SECRET_KEY_RING_FILE) }}
+        ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+        ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+        ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
+        ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_KEY_CONTENTS }}
     # only for NON-releases on macos-14
     - name: macos-14 lightweight build with Gradle for libs and apps
       if: ${{ !startsWith(github.ref, 'refs/tags/') && contains(matrix.os, 'macos-14') }}
       run: ./gradlew --warning-mode all publishToMavenLocal
     # only for releases on macos-14
     - name: macos-14 lightweight publish with Gradle for libs and apps
       if: ${{ startsWith(github.ref, 'refs/tags/') && contains(matrix.os, 'macos-14') }}
-      run: ./gradlew --no-daemon --warning-mode all publishMacosArm64PublicationToOSSRHRepository PublishIosArm64PublicationToOSSRHRepository PublishIosSimulatorArm64PublicationToOSSRHRepository
+      run: ./gradlew --no-daemon --warning-mode all publishMacosArm64PublicationToMavenCentralRepository PublishIosArm64PublicationToMavenCentralRepository PublishIosSimulatorArm64PublicationToMavenCentralRepository
       env:
-        OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-        OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-        OSSRH_STAGING_REPOSITORY_ID: ${{ needs.create_staging_repository.outputs.repository_id }}
-        SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-        SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-        SIGNING_SECRET_KEY_RING_FILE: ${{ format('{0}/{1}', github.workspace, secrets.SIGNING_SECRET_KEY_RING_FILE) }}
+        ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+        ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+        ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
+        ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_KEY_CONTENTS }}
     # only for NON-releases on Linux
     - name: linux build
       if: ${{ !startsWith(github.ref, 'refs/tags/') && contains(matrix.os, 'ubuntu') }}
       run: ./gradlew --warning-mode all build publishToMavenLocal
     # only for releases on Linux
     - name: linux publish with Gradle
       if: ${{ startsWith(github.ref, 'refs/tags/') && contains(matrix.os, 'ubuntu') }}
-      run: ./gradlew --warning-mode all build publishAllPublicationsToOSSRHRepository
+      run: ./gradlew --warning-mode all build publishAllPublicationsToMavenCentralRepository
       env:
-        OSSRH_USERNAME: atsushieno
-        OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-        OSSRH_STAGING_REPOSITORY_ID: ${{ needs.create_staging_repository.outputs.repository_id }}
-        SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-        SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-        SIGNING_SECRET_KEY_RING_FILE: ${{ format('{0}/{1}', github.workspace, secrets.SIGNING_SECRET_KEY_RING_FILE) }}
+        ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+        ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+        ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
+        ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_KEY_CONTENTS }}
       # only for releases on Linux
     - name: linux publish with Gradle
       if: ${{ startsWith(github.ref, 'refs/tags/') && contains(matrix.os, 'ubuntu') }}
diff --git a/build.gradle b/build.gradle
@@ -9,6 +9,7 @@ plugins {
     alias(libs.plugins.npmPublish) apply false
     alias(libs.plugins.antlrKotlinPlugin) apply false
     alias(libs.plugins.binaryCompatibilityValidatorPlugin) apply false
+    alias(libs.plugins.vanniktech.maven.publish) apply false
 }
 
 allprojects {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -27,6 +27,8 @@ startup-runtime = "1.2.0"
 ktmidi = "0.11.0"
 mugene = "0.7.0"
 
+vanniktech-maven-publish = "0.31.0"
+
 [libraries]
 ktmidi = { module = "dev.atsushieno:ktmidi", version.ref = "ktmidi" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
@@ -45,6 +47,7 @@ gradleJavacppPlatform = { id = "org.bytedeco.gradle-javacpp-platform", version.r
 npmPublish = { id = "org.danilopianini.npm.publish", version.ref = "npm-publish" }
 antlrKotlinPlugin = { id = "com.strumenta.antlr-kotlin", version.ref = "antlr-kotlin" }
 binaryCompatibilityValidatorPlugin = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }
+vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-maven-publish" }
 
 [bundles]
 
diff --git a/mugene/build.gradle.kts b/mugene/build.gradle.kts
@@ -17,8 +17,7 @@ plugins {
     alias(libs.plugins.npmPublish)
     alias(libs.plugins.dokka)
     alias(libs.plugins.antlrKotlinPlugin)
-    id("maven-publish")
-    id("signing")
+    alias(libs.plugins.vanniktech.maven.publish)
 }
 
 group = "dev.atsushieno"
@@ -208,60 +207,31 @@ android {
     }
 }
 
-afterEvaluate {
-    publishing {
-        publications.withType<MavenPublication> {
-            // https://github.com/gradle/gradle/issues/26091#issuecomment-1681343496
-            val dokkaJar = project.tasks.register("${name}DokkaJar", Jar::class) {
-                group = JavaBasePlugin.DOCUMENTATION_GROUP
-                description = "Assembles Kotlin docs with Dokka into a Javadoc jar"
-                archiveClassifier.set("javadoc")
-                from(tasks.named("dokkaHtml"))
-
-                // Each archive name should be distinct, to avoid implicit dependency issues.
-                // We use the same format as the sources Jar tasks.
-                // https://youtrack.jetbrains.com/issue/KT-46466
-                archiveBaseName.set("${archiveBaseName.get()}-${name}")
-            }
-            artifact(dokkaJar)
-
-            pom {
-                name.set("$name")
-                description.set("mugene-ng MML (Music Macro Language) compiler for MIDI 1.0 and MIDI 2.0")
-                url.set("https://github.com/atsushieno/mugene-ng")
-                scm {
-                    url.set("https://github.com/atsushieno/mugene-ng")
-                }
-                licenses {
-                    license {
-                        name.set("the MIT License")
-                        url.set("https://github.com/atsushieno/mugene-ng/blob/main/LICENSE")
-                    }
-                }
-                developers {
-                    developer {
-                        id.set("atsushieno")
-                        name.set("Atsushi Eno")
-                        email.set("atsushieno@gmail.com")
-                    }
-                }
-            }
-        }
+apply(from = "${rootDir}/publish-npm.gradle")
 
-        repositories {
-            maven {
-                name = "OSSRH"
-                url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
-                credentials {
-                    username = System.getenv("OSSRH_USERNAME")
-                    password = System.getenv("OSSRH_PASSWORD")
-                }
-            }
-        }
+val gitProjectName = "mugene-ng"
+val packageName = project.name
+val packageDescription = "mugene-ng MML (Music Macro Language) compiler for MIDI 1.0 and MIDI 2.0"
+// my common settings
+val packageUrl = "https://github.com/atsushieno/$gitProjectName"
+val licenseName = "MIT"
+val licenseUrl = "https://github.com/atsushieno/$gitProjectName/blob/main/LICENSE"
+val devId = "atsushieno"
+val devName = "Atsushi Eno"
+val devEmail = "atsushieno@gmail.com"
+
+// Common copy-pasted
+mavenPublishing {
+    publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
+    if (project.hasProperty("mavenCentralUsername") || System.getenv("ORG_GRADLE_PROJECT_mavenCentralUsername") != null)
+        signAllPublications()
+    coordinates(group.toString(), project.name, version.toString())
+    pom {
+        name.set(packageName)
+        description.set(packageDescription)
+        url.set(packageUrl)
+        scm { url.set(packageUrl) }
+        licenses { license { name.set(licenseName); url.set(licenseUrl) } }
+        developers { developer { id.set(devId); name.set(devName); email.set(devEmail) } }
     }
-
-    // keep it as is. It is replaced by CI release builds
-    signing {}
 }
-
-apply(from = "${rootDir}/publish-npm.gradle")

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ plugins {`
`9`	`9`	`alias(libs.plugins.npmPublish) apply false`
`10`	`10`	`alias(libs.plugins.antlrKotlinPlugin) apply false`
`11`	`11`	`alias(libs.plugins.binaryCompatibilityValidatorPlugin) apply false`
	`12`	`+ alias(libs.plugins.vanniktech.maven.publish) apply false`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`allprojects {`