Migrate from OSSRH to Sonatype Central publishing

- Switch to gradleup/nmcp plugin for automatic publication
- Update GitHub Actions to use SONATYPE_USERNAME/SONATYPE_PASSWORD
- Remove manual repository configuration and staging steps
- Configure modern GPG signing using global iterable secrets

Author: gmethvin

.editorconfig

@@ -3,4 +3,8 @@ root = true
 [*]
 indent_style = space
 indent_size = 4
-tab_width = 4
+tab_width = 4
+
+[*.{yml,yaml}]
+indent_size = 2
+tab_width = 2

.github/workflows/publish.yml

@@ -1,9 +1,11 @@
-name: Publish to Maven Central
+name: Publish to Sonatype Central
 
 on:
   push:
+    branches:
+      - sonatype-publish
     tags:
-      - 'v*' # Trigger on version tags
+      - "[0-9]+.[0-9]+.[0-9]+*" # Match version tags like 3.5.13, 3.6.0-beta1, etc.
   workflow_dispatch: # Allow manual trigger
 
 jobs:
@@ -15,30 +17,24 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
-          distribution: 'temurin'
+          java-version: "17"
+          distribution: "temurin"
           cache: gradle
 
-      - name: Import GPG Key
+      - name: Import GPG Key and Create Secring
         run: |
-          echo "${{ secrets.GPG_PRIVATE_KEY }}" | base64 -d > private.gpg
-          gpg --batch --import private.gpg
-          rm private.gpg
+          echo "${{ secrets.GPG_SECRET_KEY }}" | base64 -d | gpg --batch --import
+          # Create secring.gpg for Gradle signing plugin compatibility
+          gpg --batch --pinentry-mode loopback --passphrase "${{ secrets.GPG_PASSPHRASE }}" --export-secret-keys > ~/.gnupg/secring.gpg
+          # Extract last 8 characters for short format
+          GPG_KEY="${{ secrets.GPG_KEY_ID }}"
+          echo "SHORT_GPG_KEY_ID=${GPG_KEY: -8}" >> $GITHUB_ENV
 
-      - name: Build
-        run: ./gradlew clean build
+      - name: Build and Publish to Sonatype Central
+        run: ./gradlew clean assemble publishAllPublicationsToCentralPortal
         env:
-          ORG_GRADLE_PROJECT_SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-          ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-          ORG_GRADLE_PROJECT_SIGNING_SECRET_KEY_RING_FILE: ~/.gnupg/secring.gpg
-          ORG_GRADLE_PROJECT_NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
-
-      - name: Publish to Maven Central
-        run: ./gradlew uploadArchives
-        env:
-          ORG_GRADLE_PROJECT_SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-          ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-          ORG_GRADLE_PROJECT_SIGNING_SECRET_KEY_RING_FILE: ~/.gnupg/secring.gpg
-          ORG_GRADLE_PROJECT_NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} 
+          ORG_GRADLE_PROJECT_SIGNING_KEY_ID: ${{ env.SHORT_GPG_KEY_ID }}
+          ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.GPG_PASSPHRASE }}
+          ORG_GRADLE_PROJECT_SIGNING_SECRET_KEY_RING_FILE: /home/runner/.gnupg/secring.gpg
+          ORG_GRADLE_PROJECT_SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          ORG_GRADLE_PROJECT_SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}

.gitignore

@@ -67,4 +67,6 @@ pom.xml.versionsBackup
 pom.xml.next
 release.properties
 
-jacoco.exec
+jacoco.exec
+# VSCode settings
+.vscode/

build.gradle

@@ -1,7 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext.kotlin_version = '1.9.0'
-    ext.mavenPublishEnabled = true
     repositories {
         google()
         jcenter()
@@ -17,6 +16,7 @@ buildscript {
             exclude group: 'org.codehaus.groovy', module: 'groovy-all'
         }
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
+        classpath "com.gradleup.nmcp:nmcp:0.0.8"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -32,4 +32,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}

iterableapi-ui/build.gradle

@@ -64,9 +64,7 @@ ext {
     libraryVersion = '3.5.13'
 }
 
-if (hasProperty("mavenPublishEnabled")) {
-    apply from: '../maven-push.gradle'
-}
+apply from: '../maven-push.gradle'
 
 task javadoc(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs

iterableapi/build.gradle

@@ -91,9 +91,7 @@ ext {
     libraryVersion = '3.5.13'
 }
 
-if (hasProperty("mavenPublishEnabled")) {
-    apply from: '../maven-push.gradle'
-}
+apply from: '../maven-push.gradle'
 
 task javadoc(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs

maven-push.gradle

@@ -16,50 +16,42 @@
 
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
+apply plugin: 'com.gradleup.nmcp'
 
 Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
+if (project.rootProject.file('local.properties').exists()) {
+    properties.load(project.rootProject.file('local.properties').newDataInputStream())
+}
 
 def isReleaseBuild() {
     return libraryVersion.contains("SNAPSHOT") == false
 }
 
-def getReleaseRepositoryUrl() {
-    return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
-            : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-}
+// Set the project version
+project.version = libraryVersion
 
-def getSnapshotRepositoryUrl() {
-    return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
-            : "https://oss.sonatype.org/content/repositories/snapshots/"
-}
-
-def getRepositoryUsername() {
-    return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
-}
-
-def getRepositoryPassword() {
-    return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
-}
-
-def keyID = properties.getProperty("signing.keyId")
-def signing_password = properties.getProperty("signing.password")
-def keyRingLocation = properties.getProperty("signing.secretKeyRingFile")
-def nexus_username = properties.getProperty("NEXUS_USERNAME")
-def nexus_password = properties.getProperty("NEXUS_PASSWORD")
+// Simple property lookup: local.properties first, then project properties (from ORG_GRADLE_PROJECT_* env vars)
+def keyID = properties.getProperty("signing.keyId") ?: findProperty('SIGNING_KEY_ID')
+def signing_password = properties.getProperty("signing.password") ?: findProperty('SIGNING_PASSWORD')
+def keyRingLocation = properties.getProperty("signing.secretKeyRingFile") ?: findProperty('SIGNING_SECRET_KEY_RING_FILE')
+def sonatype_username = properties.getProperty("SONATYPE_USERNAME") ?: findProperty('SONATYPE_USERNAME')
+def sonatype_password = properties.getProperty("SONATYPE_PASSWORD") ?: findProperty('SONATYPE_PASSWORD')
 
 ext."signing.keyId" = keyID
-ext."signing.secretKeyRingFile" = keyRingLocation
 ext."signing.password" = signing_password
 
+// Set secretKeyRingFile if provided
+if (keyRingLocation) {
+    ext."signing.secretKeyRingFile" = keyRingLocation
+}
+
 publishing {
     publications {
         release(MavenPublication) {
-            groupId = GROUP
-            artifactId = libraryName
-            version = libraryVersion
-
             afterEvaluate {
+                groupId = GROUP
+                artifactId = libraryName
+                version = libraryVersion
                 from components.release
             }
 
@@ -92,32 +84,17 @@ publishing {
             }
         }
     }
-    repositories {
-        maven {
-            name = "OSSRH"
-            url = isReleaseBuild() ? getReleaseRepositoryUrl() : getSnapshotRepositoryUrl()
-            credentials {
-                username = nexus_username
-                password = nexus_password
-            }
-        }
-    }
 }
 
 signing {
-    required { isReleaseBuild() }
+    required { isReleaseBuild() && keyID }
     sign publishing.publications.release
 }
 
-tasks.register('uploadArchives') {
-    dependsOn publishReleasePublicationToOSSRHRepository
-}
-
-tasks.register('androidSourcesJar', Jar) {
-    archiveClassifier = 'sources'
-    from android.sourceSets.main.java.sourceFiles
+nmcp {
+    publishAllPublications {
+        username = sonatype_username
+        password = sonatype_password
+        publicationType = "AUTOMATIC"
+    }
 }
-
-artifacts {
-    archives androidSourcesJar
-}