Migrate to vanniktech maven publish

priettt · priettt · commit cf0b6ad8bdc5 · 2025-07-01T16:55:10.000-03:00
diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml
@@ -1,13 +1,11 @@
 name: Release RC and Update Docs
 
 env:
-  SONATYPE_USERNAME: ${{ secrets.SONATYPE_TOKEN_USER }}
-  SONATYPE_PASSWORD: ${{ secrets.SONATYPE_TOKEN_USER_PASSWORD }}
-  MAVEN_QA_USER: github
-  MAVEN_QA_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
-  mavenSigningKeyId: ${{ secrets.MAVEN_ANDROID_SIGNING_KEY }}
-  mavenSigningKeyRingFileEncoded: ${{ secrets.MAVEN_ANDROID_GPG_KEY }}
-  mavenSigningKeyPassword: ${{ secrets.MAVEN_ANDROID_SIGNING_PASSWORD }}
+  ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_TOKEN_USER }}
+  ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_TOKEN_USER_PASSWORD }}
+  ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.MAVEN_ANDROID_SIGNING_KEY }}
+  ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_ANDROID_GPG_KEY }}
+  ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_ANDROID_SIGNING_PASSWORD }}
 
 on:
   workflow_dispatch:
@@ -49,9 +47,10 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
 
-      - name: Release to Maven Central
-        run: |
-          ./gradlew findSonatypeStagingRepository releaseSonatypeStagingRepository -Dorg.gradle.parallel=false --no-build-cache --no-configuration-cache --stacktrace
+#      Releases are done manually now, from the central portal.
+#      - name: Release from Staging Repository
+#        run: |
+#          ./gradlew releaseToMavenCentral --no-configuration-cache --stacktrace
 
       - name: Record SDK Version History
         uses: embrace-io/public-actions/upload-sdk-version@88167cd1a3fce3418e26c8c842026e6dfab99e41
diff --git a/.github/workflows/upload-artifacts-to-sonatype.yml b/.github/workflows/upload-artifacts-to-sonatype.yml
@@ -1,13 +1,11 @@
 name: Upload artifacts to Sonatype
 
 env:
-  SONATYPE_USERNAME: ${{ secrets.SONATYPE_TOKEN_USER }}
-  SONATYPE_PASSWORD: ${{ secrets.SONATYPE_TOKEN_USER_PASSWORD }}
-  MAVEN_QA_USER: github
-  MAVEN_QA_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
-  mavenSigningKeyId: ${{ secrets.MAVEN_ANDROID_SIGNING_KEY }}
-  mavenSigningKeyRingFileEncoded: ${{ secrets.MAVEN_ANDROID_GPG_KEY }}
-  mavenSigningKeyPassword: ${{ secrets.MAVEN_ANDROID_SIGNING_PASSWORD }}
+  ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_TOKEN_USER }}
+  ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_TOKEN_USER_PASSWORD }}
+  ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.MAVEN_ANDROID_SIGNING_KEY }}
+  ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_ANDROID_GPG_KEY }}
+  ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_ANDROID_SIGNING_PASSWORD }}
 
 on:
   workflow_call:
@@ -54,9 +52,9 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
 
-      - name: Publish and close Sonatype repository
+      - name: Publish to Maven Central
         run: |
-          ./gradlew publishAllPublicationsToSonatypeRepository -x embrace-gradle-plugin-integration-tests:publishAllPublicationsToSonatypeRepository closeSonatypeStagingRepository -Dorg.gradle.parallel=false --no-build-cache --no-configuration-cache --stacktrace
+          ./gradlew publishToMavenCentral -x embrace-gradle-plugin-integration-tests:publishToMavenCentral --no-configuration-cache --stacktrace
 
       - name: Publish git tag
         run: |
diff --git a/.github/workflows/upload-test.yml b/.github/workflows/upload-test.yml
@@ -0,0 +1,68 @@
+name: Upload test
+
+env:
+  ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_TOKEN_USER }}
+  ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_TOKEN_USER_PASSWORD }}
+  ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.MAVEN_ANDROID_SIGNING_KEY }}
+  ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_ANDROID_GPG_KEY }}
+  ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_ANDROID_SIGNING_PASSWORD }}
+
+on:
+  workflow_call:
+    inputs:
+      rc_version:
+        required: true
+        type: string
+  workflow_dispatch:
+    inputs:
+      rc_version:
+        description: 'Version to create new RC for. Specify <major.minor.patch>, e.g. 7.1.2'
+        required: true
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+      - name: Decode Keystore
+        run: |
+          mkdir "$RUNNER_TEMP"/keystore
+          echo $mavenSigningKeyRingFileEncoded | base64 -di > "$RUNNER_TEMP"/keystore/2DE631C1.gpg
+          echo "mavenSigningKeyRingFile=$RUNNER_TEMP/keystore/2DE631C1.gpg" >> $GITHUB_ENV
+
+      - name: Configure git
+        run: |
+          git config --global user.name 'embrace-ci[bot]'
+          git config --global user.email 'embrace-ci@users.noreply.github.com'
+
+      - name: Create Test Branch "test/${{ inputs.rc_version }}"
+        run: |
+          git checkout -b test/${{ inputs.rc_version }}
+
+      - name: Set version in gradle.properties
+        run: |
+          sed -i -r "s#version=([^\']+)#version=${{ inputs.rc_version }}#" gradle.properties
+          git add gradle.properties
+          git commit -m "CI/CD: change version to be released: ${{ inputs.rc_version }}"
+          git push --set-upstream origin test/${{ inputs.rc_version }}
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: test/${{ inputs.rc_version }}
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'adopt'
+          java-version: 17
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
+
+      - name: Publish to Maven Central
+        run: |
+          ./gradlew publishToMavenCentral -x embrace-gradle-plugin-integration-tests:publishToMavenCentral --no-configuration-cache --stacktrace
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,35 +1,17 @@
-import java.time.Duration
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 
 plugins {
     kotlin("android") apply false
     kotlin("jvm") apply false
     alias(libs.plugins.google.ksp) apply false
     id("com.android.library") apply false
-    alias(libs.plugins.nexus.publish)
     alias(libs.plugins.dokka)
     alias(libs.plugins.kover)
 }
 
 group = "io.embrace"
 version = project.version
 
-nexusPublishing {
-    repositories {
-        sonatype {
-            username = System.getenv("SONATYPE_USERNAME")
-            password = System.getenv("SONATYPE_PASSWORD")
-            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
-        }
-    }
-    transitionCheckOptions {
-        maxRetries.set(60)
-        delayBetween.set(Duration.ofSeconds(20))
-    }
-    connectTimeout.set(Duration.ofMinutes(15))
-    clientTimeout.set(Duration.ofMinutes(15))
-}
-
 subprojects {
     if (project.name == "embrace-android-sdk" || project.name == "embrace-android-api") {
         apply(plugin = "org.jetbrains.dokka")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
     implementation(libs.agp)
     implementation(libs.detekt.gradle.plugin)
     implementation(libs.binary.compatibility.validator)
+    implementation(libs.vanniktech.maven.publish)
 }
 
 gradlePlugin {
diff --git a/buildSrc/src/main/kotlin/io/embrace/internal/ProductionModuleConfig.kt b/buildSrc/src/main/kotlin/io/embrace/internal/ProductionModuleConfig.kt
@@ -7,13 +7,12 @@ import org.gradle.kotlin.dsl.getByType
 
 fun Project.configureProductionModule(
     android: LibraryExtension,
-    module: EmbraceBuildLogicExtension
+    module: EmbraceBuildLogicExtension,
 ) {
     with(project.pluginManager) {
         apply("checkstyle")
         apply("org.jetbrains.kotlinx.kover")
-        apply("maven-publish")
-        apply("signing")
+        apply("com.vanniktech.maven.publish")
         apply("binary-compatibility-validator")
     }
 
@@ -37,16 +36,6 @@ fun Project.configureProductionModule(
             }
         }
 
-        publishing {
-
-            // create component with single publication variant
-            // https://developer.android.com/studio/publish-library/configure-pub-variants#single-pub-var
-            singleVariant("release") {
-                withSourcesJar()
-                withJavadocJar()
-            }
-        }
-
         sourceSets {
             getByName("test").java.srcDir("src/integrationTest/java")
             getByName("test").kotlin.srcDir("src/integrationTest/kotlin")
diff --git a/buildSrc/src/main/kotlin/io/embrace/internal/PublishConfig.kt b/buildSrc/src/main/kotlin/io/embrace/internal/PublishConfig.kt
@@ -1,95 +1,40 @@
 package io.embrace.internal
 
-import java.net.URI
+import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import org.gradle.api.Project
-import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.maven.MavenPublication
-import org.gradle.kotlin.dsl.get
-import org.gradle.kotlin.dsl.register
-import org.gradle.kotlin.dsl.withType
-import org.gradle.plugins.signing.Sign
-import org.gradle.plugins.signing.SigningExtension
 
 fun Project.configurePublishing() {
-    val publishing = project.extensions.getByType(PublishingExtension::class.java)
-
-    // https://developer.android.com/studio/publish-library/upload-library
-    publishing.apply {
-        publications {
-            register<MavenPublication>("release") {
-                addPublication(this, "release")
-            }
-        }
-
-        // configure repositories where the publication can be hosted
-        repositories {
-            // beta releases
-            maven {
-                credentials {
-                    username = System.getenv("MAVEN_QA_USER")
-                    password = System.getenv("MAVEN_QA_PASSWORD")
+    project.pluginManager.withPlugin("com.vanniktech.maven.publish") {
+        val mavenPublishing = project.extensions.getByType(MavenPublishBaseExtension::class.java)
+        mavenPublishing.apply {
+            coordinates("io.embrace", project.name, project.version.toString())
+
+            publishToMavenCentral()
+            signAllPublications()
+
+            pom {
+                name.set(project.name)
+                description.set("Embrace Android SDK")
+                url.set("https://github.com/embrace-io/embrace-android-sdk")
+                licenses {
+                    license {
+                        name.set("Embrace License")
+                        url.set("https://embrace.io/docs/terms-of-service/")
+                    }
                 }
-                name = "Qa"
-                url = URI.create("https://repo.embrace.io/repository/beta")
-            }
-            // the android-testing maven repository is used for publishing snapshots
-            maven {
-                credentials {
-                    username = System.getenv("MAVEN_QA_USER")
-                    password = System.getenv("MAVEN_QA_PASSWORD")
+                developers {
+                    developer {
+                        id.set("dev1")
+                        name.set("Embrace")
+                        email.set("support@embrace.io")
+                    }
+                }
+                scm {
+                    connection.set("scm:git:github.com/embrace-io/embrace-android-sdk.git")
+                    developerConnection.set("scm:git:ssh://github.com/embrace-io/embrace-android-sdk.git")
+                    url.set("https://github.com/embrace-io/embrace-android-sdk/tree/main")
                 }
-                name = "Snapshot"
-                url = URI.create("https://repo.embrace.io/repository/android-testing")
-            }
-        }
-    }
-
-    val signing = project.extensions.getByType(SigningExtension::class.java)
-
-    signing.apply {
-        val keyId = System.getenv("mavenSigningKeyId")
-        val key = System.getenv("mavenSigningKeyRingFileEncoded")
-        val password = System.getenv("mavenSigningKeyPassword")
-        useInMemoryPgpKeys(keyId, key, password)
-        sign(publishing.publications.getByName("release"))
-    }
-
-    project.tasks.withType(Sign::class).configureEach {
-        enabled = !project.version.toString().endsWith("-SNAPSHOT")
-    }
-}
-
-private fun Project.addPublication(publication: MavenPublication, componentName: String) = with(publication) {
-    groupId = "io.embrace"
-    artifactId = project.name
-    version = project.version.toString()
-
-    afterEvaluate {
-        from(components[componentName])
-    }
-
-    // append some license metadata to the POM.
-    pom {
-        name.set(project.name)
-        description.set("Embrace Android SDK")
-        url.set("https://github.com/embrace-io/embrace-android-sdk")
-        licenses {
-            license {
-                name.set("Embrace License")
-                url.set("https://embrace.io/docs/terms-of-service/")
-            }
-        }
-        developers {
-            developer {
-                id.set("dev1")
-                name.set("Embrace")
-                email.set("support@embrace.io")
             }
         }
-        scm {
-            connection.set("scm:git:github.com/embrace-io/embrace-android-sdk.git")
-            developerConnection.set("scm:git:ssh://github.com/embrace-io/embrace-android-sdk.git")
-            url.set("https://github.com/embrace-io/embrace-android-sdk/tree/main")
-        }
     }
 }
diff --git a/embrace-gradle-plugin/build.gradle.kts b/embrace-gradle-plugin/build.gradle.kts
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ dependencies {`
`19`	`19`	`implementation(libs.agp)`
`20`	`20`	`implementation(libs.detekt.gradle.plugin)`
`21`	`21`	`implementation(libs.binary.compatibility.validator)`
	`22`	`+ implementation(libs.vanniktech.maven.publish)`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`gradlePlugin {`