diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ff5bdb43..a47cce0c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ on: push: tags: - "[0-9]+.[0-9]+.[0-9]+" - workflow_dispatch: + workflow_dispatch: {} # support manual runs jobs: publish: @@ -23,7 +23,7 @@ jobs: distribution: temurin java-version: 11 check-latest: true - - name: Build + - name: Publish uses: gradle/gradle-build-action@v2 with: arguments: | @@ -34,9 +34,9 @@ jobs: -Dorg.gradle.internal.network.retry.max.attempts=1 -Dorg.gradle.internal.publish.checksums.insecure=true env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - PGP_KEY: ${{ secrets.PGP_KEY }} - PGP_PASSWORD: ${{ secrets.PGP_PASSWORD }} - GRADLE_PORTAL_PUBLISH_KEY: ${{ secrets.GRADLE_PORTAL_PUBLISH_KEY }} - GRADLE_PORTAL_PUBLISH_SECRET: ${{ secrets.GRADLE_PORTAL_PUBLISH_SECRET }} + OSSRH_USERNAME: ${{ secrets.SONATYPE_USER }} + OSSRH_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + PGP_KEY: ${{ secrets.GPG_KEY_ARMORED }} + PGP_PASSWORD: ${{ secrets.GPG_PASSPHRASE }} + GRADLE_PORTAL_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }} + GRADLE_PORTAL_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }} diff --git a/buildSrc/src/main/kotlin/ConfigurePublishing.kt b/buildSrc/src/main/kotlin/ConfigurePublishing.kt index ca83aff1..444bba0a 100644 --- a/buildSrc/src/main/kotlin/ConfigurePublishing.kt +++ b/buildSrc/src/main/kotlin/ConfigurePublishing.kt @@ -56,6 +56,8 @@ fun Project.configurePublishing() { configure { repositories { sonatype { + nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) + snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) username.set(Remote.username) password.set(Remote.password) } @@ -72,7 +74,6 @@ fun Project.configurePublishing() { configure { useInMemoryPgpKeys(Pgp.key, Pgp.password) - the().publications.withType { standardPom() sign(this) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 541a7988..654bcf60 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ # plugins animalsniffer = "1.5.4" kotlin = "1.6.20" -pluginPublish = "1.0.0" +pluginPublish = "1.1.0" publishing = "0.22.0" spotless = "6.11.0"