Merge pull request #1321 from square/sedwards/sonatype-central

BlockJakeWharton · web-flow · commit f0ca5cbffca9 · 2025-06-12T16:08:53.000-04:00
1314: Update Sonatype Central Secrets
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -34,6 +34,7 @@ jobs:
         with:
           task: publish
         env:
-          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ARTIFACT_SIGNING_PRIVATE_KEY }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SECRET_KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_SECRET_PASSPHRASE }}
diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -39,5 +39,7 @@ jobs:
         with:
           task: publish
         env:
-          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SECRET_KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_SECRET_PASSPHRASE }}
diff --git a/build-logic/src/main/java/com/squareup/workflow1/buildsrc/PublishingConventionPlugin.kt b/build-logic/src/main/java/com/squareup/workflow1/buildsrc/PublishingConventionPlugin.kt
@@ -48,7 +48,7 @@ class PublishingConventionPlugin : Plugin<Project> {
     }
 
     target.extensions.configure(MavenPublishBaseExtension::class.java) { basePluginExtension ->
-      basePluginExtension.publishToMavenCentral(SonatypeHost.S01, automaticRelease = true)
+      basePluginExtension.publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
       // Will only apply to non snapshot builds.
       basePluginExtension.signAllPublications()
       // import all settings from root project and project-specific gradle.properties files

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class PublishingConventionPlugin : Plugin<Project> {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`target.extensions.configure(MavenPublishBaseExtension::class.java) { basePluginExtension ->`
`51`		`- basePluginExtension.publishToMavenCentral(SonatypeHost.S01, automaticRelease = true)`
	`51`	`+ basePluginExtension.publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)`
`52`	`52`	`// Will only apply to non snapshot builds.`
`53`	`53`	`basePluginExtension.signAllPublications()`
`54`	`54`	`// import all settings from root project and project-specific gradle.properties files`