From fb0d3bb1dd0e717804271b893b33935f2b3a48c7 Mon Sep 17 00:00:00 2001 From: Ryan Brink <5607577+brizzbuzz@users.noreply.github.com> Date: Wed, 30 Oct 2024 16:49:26 -0400 Subject: [PATCH] fix: on the path to fixing publishing to maven central (#648) --- .github/workflows/publish.yml | 25 ------------------------ .github/workflows/release.yml | 15 +++++++------- build.gradle.kts | 19 +++++++++++------- core/build.gradle.kts | 2 +- enrichment/build.gradle.kts | 2 +- json-schema/build.gradle.kts | 2 +- oas/build.gradle.kts | 2 +- protobuf-java-converter/build.gradle.kts | 1 - resources/build.gradle.kts | 1 - 9 files changed, 24 insertions(+), 45 deletions(-) delete mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml deleted file mode 100644 index 3e1f35686..000000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Publish to GitHub Packages -on: - push: - branches: [ main ] - paths-ignore: - - docs/** -env: - ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SONATYPE_SIGNING_KEY }} - ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} -jobs: - publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'adopt' - java-version: '21' - - name: Publish to GitHub Packages - uses: burrunan/gradle-cache-action@v1 - with: - gradle-version: wrapper - arguments: publishAllPublicationsToGithubPackagesRepository - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9cb098bf3..901dbf3b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,11 +4,8 @@ on: types: - prereleased - released -env: - ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SONATYPE_SIGNING_KEY }} - ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SONATYPE_SIGNING_PASSWORD }} jobs: - publish-to-nexus: + publish-to-maven-central: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -20,9 +17,13 @@ jobs: uses: burrunan/gradle-cache-action@v1 with: gradle-version: wrapper - arguments: publishToSonatype closeAndReleaseSonatypeStagingRepository + arguments: publishAndReleaseToMavenCentral properties: | + SONATYPE_AUTOMATIC_RELEASE=true release=true env: - ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USER }} - ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_SIGNING_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.MAVEN_SIGNING_KEY_ID }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_SIGNING_KEY_PASSPHRASE }} diff --git a/build.gradle.kts b/build.gradle.kts index b51ef924d..934ef5a14 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,15 @@ +import com.vanniktech.maven.publish.SonatypeHost +import io.bkbn.sourdough.gradle.library.jvm.LibraryJvmPlugin +import io.bkbn.sourdough.gradle.library.jvm.LibraryJvmExtension + plugins { kotlin("jvm") version "2.0.21" apply false kotlin("plugin.serialization") version "2.0.21" apply false - id("io.bkbn.sourdough.library.jvm") version "0.12.2" apply false - id("io.bkbn.sourdough.application.jvm") version "0.12.2" apply false - id("io.bkbn.sourdough.root") version "0.12.2" + id("io.bkbn.sourdough.library.jvm") version "0.13.0" apply false + id("io.bkbn.sourdough.application.jvm") version "0.13.0" apply false + id("com.vanniktech.maven.publish") version "0.30.0" apply false + id("io.bkbn.sourdough.root") version "0.13.0" id("org.jetbrains.kotlinx.kover") version "0.8.3" - id("io.github.gradle-nexus.publish-plugin") version "1.3.0" } dependencies { @@ -25,15 +29,16 @@ allprojects { } subprojects { - plugins.withType(io.bkbn.sourdough.gradle.library.jvm.LibraryJvmPlugin::class) { - extensions.configure(io.bkbn.sourdough.gradle.library.jvm.LibraryJvmExtension::class) { + plugins.withType(LibraryJvmPlugin::class) { + extensions.configure(LibraryJvmExtension::class) { githubOrg.set("bkbnio") githubRepo.set("kompendium") licenseName.set("MIT License") licenseUrl.set("https://mit-license.org") - developerId.set("unredundant") + developerId.set("brizzbuzz") developerName.set("Ryan Brink") developerEmail.set("admin@bkbn.io") + sonatypeHost.set(SonatypeHost.CENTRAL_PORTAL) } } } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index fb92bd9df..dad654cf3 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -4,7 +4,7 @@ plugins { id("io.bkbn.sourdough.library.jvm") id("io.gitlab.arturbosch.detekt") id("com.adarshr.test-logger") - id("maven-publish") + id("com.vanniktech.maven.publish") id("java-library") id("signing") id("java-test-fixtures") diff --git a/enrichment/build.gradle.kts b/enrichment/build.gradle.kts index bf2a85953..125b74d8d 100644 --- a/enrichment/build.gradle.kts +++ b/enrichment/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("io.bkbn.sourdough.library.jvm") id("io.gitlab.arturbosch.detekt") id("com.adarshr.test-logger") - id("maven-publish") + id("com.vanniktech.maven.publish") id("java-library") id("signing") id("org.jetbrains.kotlinx.kover") diff --git a/json-schema/build.gradle.kts b/json-schema/build.gradle.kts index 9f90d9f91..0592050ea 100644 --- a/json-schema/build.gradle.kts +++ b/json-schema/build.gradle.kts @@ -4,7 +4,7 @@ plugins { id("io.bkbn.sourdough.library.jvm") id("io.gitlab.arturbosch.detekt") id("com.adarshr.test-logger") - id("maven-publish") + id("com.vanniktech.maven.publish") id("java-library") id("signing") id("org.jetbrains.kotlinx.kover") diff --git a/oas/build.gradle.kts b/oas/build.gradle.kts index e19d5f0b7..ab4c82231 100644 --- a/oas/build.gradle.kts +++ b/oas/build.gradle.kts @@ -4,7 +4,7 @@ plugins { id("io.bkbn.sourdough.library.jvm") id("io.gitlab.arturbosch.detekt") id("com.adarshr.test-logger") - id("maven-publish") + id("com.vanniktech.maven.publish") id("java-library") id("signing") id("org.jetbrains.kotlinx.kover") diff --git a/protobuf-java-converter/build.gradle.kts b/protobuf-java-converter/build.gradle.kts index ac0e2ad2d..b3c77dba9 100644 --- a/protobuf-java-converter/build.gradle.kts +++ b/protobuf-java-converter/build.gradle.kts @@ -4,7 +4,6 @@ plugins { id("io.bkbn.sourdough.library.jvm") id("io.gitlab.arturbosch.detekt") id("com.adarshr.test-logger") - id("maven-publish") id("java-library") id("signing") id("org.jetbrains.kotlinx.kover") diff --git a/resources/build.gradle.kts b/resources/build.gradle.kts index 6f910791e..d8d806caf 100644 --- a/resources/build.gradle.kts +++ b/resources/build.gradle.kts @@ -4,7 +4,6 @@ plugins { id("io.bkbn.sourdough.library.jvm") id("io.gitlab.arturbosch.detekt") id("com.adarshr.test-logger") - id("maven-publish") id("java-library") id("signing") id("org.jetbrains.kotlinx.kover")