diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 42bdd9898..839189166 100644 --- 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 index 783954cc2..2b8904d67 100644 --- 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 index 56e2cd0a7..60d463706 100644 --- 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 { } 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