migrate to sonatype upload as new publisher target.

atsushieno · atsushieno · commit ad3e651b2604 · 2025-05-12T16:05:51.000+09:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,16 +1,17 @@
-name: build dist
+name: build
 
 on:
   push:
   pull_request:
+  workflow_call:
 
 jobs:
   linux-build:
     name: build on linux
     runs-on: ubuntu-24.04
     steps:
     - name: checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: apt update
@@ -21,19 +22,6 @@ jobs:
       with:
         java-version: 17
         distribution: temurin
-    # ONLY FOR NEW RELEASE TAGS
-    - name: setup gpg necessities
-      if: startsWith(github.ref, 'refs/tags/')
-      run: sudo bash -c "echo '$GPG_KEY_CONTENTS' | base64 -d > $WORKSPACE/'$SIGNING_SECRET_KEY_RING_FILE'"
-      env:
-        WORKSPACE: ${{ github.workspace }}
-        GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }}
-        SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
-    # ONLY FOR NEW RELEASE TAGS
-    - name: rewrite publish-pom.gradle to require signing
-      if: startsWith(github.ref, 'refs/tags/')
-      run: |
-        sed -i "s/signing {}/signing { sign(publishing.publications) }/" publish-pom.gradle
     - name: cache AVD
       uses: actions/cache@v4
       env:
@@ -55,16 +43,6 @@ jobs:
     - name: build
       if: ${{ !startsWith(github.ref, 'refs/tags/') }}
       run: ./gradlew build dokkaHtml publishToMavenLocal
-    # ONLY FOR NEW RELEASE TAGS
-    - name: publish
-      if: startsWith(github.ref, 'refs/tags/')
-      run: ./gradlew --warning-mode all publish dokkaHtml
-      env:
-        OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-        OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-        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) }}
     - name: run instrumented tests (disabled)
       if: false
       # > Gradle was not able to complete device setup for: dev30_google_x86_Pixel_5
@@ -81,19 +59,6 @@ jobs:
         path: |
           ./*/build/outputs/aar/*.aar
           samples/*/build/outputs/apk/debug/*.apk
-    # Create release, only for release tags
-    - name: Create Release
-      uses: ncipollo/release-action@v1
-      if: success() && startsWith(github.ref, 'refs/tags/')
-      with:
-        artifacts: ./*/build/outputs/aar/*.aar,samples/*/build/outputs/apk/debug/*.apk
-    # Update API reference, only for release tags
-    - name: deploy to GitHub Pages
-      if: ${{ success() && startsWith(github.ref, 'refs/tags/') }}
-      uses: JamesIves/github-pages-deploy-action@v4
-      with:
-        branch: gh-pages
-        folder: androidaudioplugin/build/dokka/html
 
   osx-build:
     name: build on osx
@@ -104,7 +69,7 @@ jobs:
       with:
         submodules: recursive
     - name: set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         distribution: temurin
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -0,0 +1,61 @@
+name: deploy to Maven Central
+
+on: workflow_dispatch
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    uses: ./.github/workflows/build.yml
+  deploy:
+    needs: build
+    runs-on: ubuntu-24.04
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: temurin
+      - name: setup gpg necessities
+        run: sudo bash -c "echo '$GPG_KEY_CONTENTS' | base64 -d > $WORKSPACE/'$SIGNING_SECRET_KEY_RING_FILE'"
+        env:
+          WORKSPACE: ${{ github.workspace }}
+          GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }}
+          SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
+      - name: rewrite publish-pom.gradle to require signing
+        run: |
+          sed -i "s/signing {}/signing { sign(publishing.publications) }/" publish-pom.gradle
+      - name: publish
+        run: ./gradlew --warning-mode=all dokkaHtml sonatypeCentralUpload
+        env:
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          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) }}
+      - name: upload artifact
+        if: false #success()
+        uses: actions/upload-artifact@v4
+        with:
+          name: aap-core-apps-and-libs
+          path: |
+            ./*/build/outputs/aar/*.aar
+            samples/*/build/outputs/apk/debug/*.apk
+      # Create release
+      - name: Create Release
+        uses: ncipollo/release-action@v1
+        if: success() && startsWith(github.ref, 'refs/tags/')
+        with:
+          artifacts: ./*/build/outputs/aar/*.aar,samples/*/build/outputs/apk/debug/*.apk
+      # Update API reference
+      - name: deploy to GitHub Pages
+        if: success() && startsWith(github.ref, 'refs/tags/')
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          branch: gh-pages
+          folder: androidaudioplugin/build/dokka/html
diff --git a/androidaudioplugin-manager/build.gradle.kts b/androidaudioplugin-manager/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id ("org.jetbrains.dokka")
     id ("maven-publish")
     id ("signing")
+    id("cl.franciscosolis.sonatype-central-upload")
 }
 
 apply { from ("../common.gradle") }
diff --git a/androidaudioplugin-midi-device-service/build.gradle.kts b/androidaudioplugin-midi-device-service/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id ("org.jetbrains.dokka")
     id ("maven-publish")
     id ("signing")
+    id("cl.franciscosolis.sonatype-central-upload")
 }
 
 apply { from ("../common.gradle") }
diff --git a/androidaudioplugin-testing/build.gradle.kts b/androidaudioplugin-testing/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id ("org.jetbrains.dokka")
     id ("maven-publish")
     id ("signing")
+    id("cl.franciscosolis.sonatype-central-upload")
 }
 
 apply { from ("../common.gradle") }
diff --git a/androidaudioplugin-ui-compose-app/build.gradle.kts b/androidaudioplugin-ui-compose-app/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.dokka)
     id ("maven-publish")
     id ("signing")
+    id("cl.franciscosolis.sonatype-central-upload")
 }
 
 apply { from ("../common.gradle") }
diff --git a/androidaudioplugin-ui-compose/build.gradle.kts b/androidaudioplugin-ui-compose/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.dokka)
     id ("maven-publish")
     id ("signing")
+    id("cl.franciscosolis.sonatype-central-upload")
 }
 
 apply { from ("../common.gradle") }
diff --git a/androidaudioplugin-ui-web/build.gradle.kts b/androidaudioplugin-ui-web/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id ("org.jetbrains.dokka")
     id ("maven-publish")
     id ("signing")
+    id("cl.franciscosolis.sonatype-central-upload")
 }
 
 apply { from ("../common.gradle") }
diff --git a/androidaudioplugin/build.gradle.kts b/androidaudioplugin/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.dokka)
     id ("maven-publish")
     id ("signing")
+    id("cl.franciscosolis.sonatype-central-upload")
 }
 
 apply { from ("../common.gradle") }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.dokka) apply false
+    id("cl.franciscosolis.sonatype-central-upload") version ("1.0.3") apply false
 }
 
 buildscript {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 
-aap-core = "0.9.1"
-aap-lv2 = "0.4.1"
+aap-core = "0.9.2"
+aap-lv2 = "0.4.2"
 
 android-compileSdk = "36"
 android-minSdk = "29"
diff --git a/publish-pom.gradle b/publish-pom.gradle
@@ -8,21 +8,28 @@ android {
     }
 }
 
+version = libs.versions.aap.core.get()
+
 afterEvaluate {
-    tasks.register('sourceJar', Jar) {
+    // based on https://zenn.dev/orangain/articles/publish-to-maven-central-using-gradle#fn-c896-2
+    // Note that this will build valid archive only on clean environment like CI builds.
+    tasks.register("makeArchive", Zip) {
+        dependsOn("publishReleasePublicationToMavenRepository")
+        from layout.buildDirectory.dir("stub-install")
+        into "."
+    }
+
+    tasks.register('sourcesJar', Jar) {
         from android.sourceSets.main.java.srcDirs
         from android.sourceSets.main.kotlin.srcDirs
         archiveClassifier.set('sources')
     }
+
     publishing {
         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")
-                }
+                // Install once into fake directory (not to mavenLocal, because it can skip signing)
+                url = uri(layout.buildDirectory.dir("stub-install"))
             }
         }
 
@@ -72,6 +79,20 @@ afterEvaluate {
         }
     }
 
+    // based on https://zenn.dev/orangain/articles/publish-to-maven-central-using-gradle#fn-c896-2
+    tasks.named("sonatypeCentralUpload") {
+        dependsOn("makeArchive")
+
+        username = System.getenv("OSSRH_USERNAME")
+        password = System.getenv("OSSRH_PASSWORD")
+
+        archives = tasks.named("makeArchive").get().outputs.files.singleFile
+        pom = file(tasks.named("generatePomFileForReleasePublication").get().outputs.files.singleFile)
+
+        signingKey = System.getenv("SIGNING_KEY_ID")
+        signingKeyPassphrase = System.getenv("SIGNING_PASSWORD")
+    }
+
     // keep it as is. It is replaced by CI release builds
     signing {}
 }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ plugins {`
`4`	`4`	`id ("org.jetbrains.dokka")`
`5`	`5`	`id ("maven-publish")`
`6`	`6`	`id ("signing")`
	`7`	`+ id("cl.franciscosolis.sonatype-central-upload")`
`7`	`8`	`}`
`8`	`9`
`9`	`10`	`apply { from ("../common.gradle") }`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ plugins {`
`5`	`5`	`alias(libs.plugins.dokka)`
`6`	`6`	`id ("maven-publish")`
`7`	`7`	`id ("signing")`
	`8`	`+ id("cl.franciscosolis.sonatype-central-upload")`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`apply { from ("../common.gradle") }`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ plugins {`
`5`	`5`	`alias(libs.plugins.kotlin.android) apply false`
`6`	`6`	`alias(libs.plugins.compose.compiler) apply false`
`7`	`7`	`alias(libs.plugins.dokka) apply false`
	`8`	`+ id("cl.franciscosolis.sonatype-central-upload") version ("1.0.3") apply false`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`buildscript {`