From 9ff428c42b5742b29f13e82876933399d221e68b Mon Sep 17 00:00:00 2001 From: Jonathan Baker Date: Thu, 30 Jan 2025 13:56:40 -0500 Subject: [PATCH] Update deployment workflow. --- .github/workflows/deploy.yml | 11 +++------ MobileBuy/buy3/build.gradle.kts | 40 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5732837c..b0991dbb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,11 +17,6 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 - - name: Install Ruby - uses: ruby/setup-ruby@v1 - with: - bundler-cache: true - - name: Install JDK uses: actions/setup-java@v4 with: @@ -33,10 +28,10 @@ jobs: - name: Publish Package working-directory: ./MobileBuy - run: ./gradlew buy3:uploadArchives + run: ./gradlew publish env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME }} + ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRH_PASSWORD }} ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.OSSRH_GPG_SECRET_KEY_ID }} ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_GPG_SECRET_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} diff --git a/MobileBuy/buy3/build.gradle.kts b/MobileBuy/buy3/build.gradle.kts index 93ef26ab..71c2d3c6 100644 --- a/MobileBuy/buy3/build.gradle.kts +++ b/MobileBuy/buy3/build.gradle.kts @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) + signing `maven-publish` } @@ -77,9 +78,48 @@ publishing { groupId = "com.shopify.mobilebuysdk" artifactId = "buy3" + pom { + name = "Mobile Buy SDK" + url = "https://github.com/Shopify/mobile-buy-sdk-android.git" + developers { + developer { + name = "Shopify Inc." + } + } + } + afterEvaluate { from(components["release"]) } } } + repositories { + maven { + name = "Staging" + + url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") + + val ossrhUsername: String? by project + val ossrhPassword: String? by project + + credentials { + username = ossrhUsername + password = ossrhPassword + } + } + } +} + +signing { + setRequired({ + gradle.taskGraph.hasTask("publish") + }) + + val signingKeyId: String? by project + val signingKey: String? by project + val signingPassword: String? by project + + useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) + + sign(publishing.publications["release"]) }