From 525dc3293dff93a06a93075a9c353db7c3885ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20L=C3=B3pez=20Ma=C3=B1as?= Date: Fri, 21 Jun 2024 14:23:26 +0200 Subject: [PATCH 1/9] chore: update Sonatype token --- .../convention/src/main/kotlin/PublishingConventionPlugin.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt b/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt index 2dcb9e37a..80139f7f1 100644 --- a/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt @@ -92,8 +92,8 @@ class PublishingConventionPlugin : Plugin { val snapshotsRepoUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/") url = if (project.version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl credentials { - username = project.findProperty("sonatypeUsername") as String? - password = project.findProperty("sonatypePassword") as String? + username = project.findProperty("sonatypeToken") as String? + password = project.findProperty("sonatypeTokenPassword") as String? } } } From df2cbc2adc0c372d3b4e8441c4ec7249573a57f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Mon, 24 Jun 2024 14:07:02 +0200 Subject: [PATCH 2/9] chore: config in release --- .github/workflows/release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c5e4eb3aa..2904c8a8c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,9 +38,9 @@ jobs: gpg --quiet --output $GITHUB_WORKSPACE/release.gpg --dearmor ./release.asc echo "Build and publish" - sed -i -e "s,sonatypeUsername=,sonatypeUsername=$SONATYPE_USERNAME,g" gradle.properties - SONATYPE_PASSWORD_ESCAPED=$(printf '%s\n' "$SONATYPE_PASSWORD" | sed -e 's/[\/&]/\\&/g') - sed -i -e "s,sonatypePassword=,sonatypePassword=$SONATYPE_PASSWORD_ESCAPED,g" gradle.properties + sed -i -e "s,sonatypeToken=,sonatypeToken=$SONATYPE_TOKEN,g" gradle.properties + SONATYPE_TOKEN_PASSWORD_ESCAPED=$(printf '%s\n' "$SONATYPE_TOKEN_PASSWORD" | sed -e 's/[\/&]/\\&/g') + sed -i -e "s,sonatypeTokenPassword=,sonatypeTokenPassword=$SONATYPE_TOKEN_PASSWORD_ESCAPED,g" gradle.properties sed -i -e "s,signing.keyId=,signing.keyId=$GPG_KEY_ID,g" gradle.properties sed -i -e "s,signing.password=,signing.password=$GPG_PASSWORD,g" gradle.properties sed -i -e "s,signing.secretKeyRingFile=,signing.secretKeyRingFile=$GITHUB_WORKSPACE/release.gpg,g" gradle.properties @@ -48,8 +48,8 @@ jobs: GPG_KEY_ARMOR: "${{ secrets.SYNCED_GPG_KEY_ARMOR }}" GPG_KEY_ID: ${{ secrets.SYNCED_GPG_KEY_ID }} GPG_PASSWORD: ${{ secrets.SYNCED_GPG_KEY_PASSWORD }} - SONATYPE_PASSWORD: ${{ secrets.SYNCED_SONATYPE_PASSWORD }} - SONATYPE_USERNAME: ${{ secrets.SYNCED_SONATYPE_USERNAME }} + SONATYPE_TOKEN_PASSWORD: ${{ secrets.SYNCED_SONATYPE_TOKEN_PASSWORD }} + SONATYPE_TOKEN: ${{ secrets.SYNCED_SONATYPE_TOKEN }} - uses: actions/setup-node@v4 with: From 3e41119b0e48c99dba255ec9d90514ce83ec99c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Mon, 24 Jun 2024 17:17:09 +0200 Subject: [PATCH 3/9] chore: config in release --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2904c8a8c..455a60b6f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,7 +49,7 @@ jobs: GPG_KEY_ID: ${{ secrets.SYNCED_GPG_KEY_ID }} GPG_PASSWORD: ${{ secrets.SYNCED_GPG_KEY_PASSWORD }} SONATYPE_TOKEN_PASSWORD: ${{ secrets.SYNCED_SONATYPE_TOKEN_PASSWORD }} - SONATYPE_TOKEN: ${{ secrets.SYNCED_SONATYPE_TOKEN }} + SONATYPE_TOKEN: ${{ secrets.SYNCED_SONATYPE_TOKEN_USERNAME }} - uses: actions/setup-node@v4 with: From 5e2feae398299ef37519a68b1bcbbcc17c3ad888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Mon, 24 Jun 2024 17:19:10 +0200 Subject: [PATCH 4/9] chore: changed gradle.properties --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8ef066d3c..96145c064 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,8 +27,8 @@ signing.keyId= signing.password= signing.secretKeyRingFile= -sonatypeUsername= -sonatypePassword= +sonatypeToken= +sonatypeTokenPassword= android.nonTransitiveRClass=false android.nonFinalResIds=false \ No newline at end of file From d851dbde343292e82badcb1c8fcb7a5fa3251ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Mon, 24 Jun 2024 17:21:22 +0200 Subject: [PATCH 5/9] chore: changed gradle.properties --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 455a60b6f..4d596489b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: gpg --quiet --output $GITHUB_WORKSPACE/release.gpg --dearmor ./release.asc echo "Build and publish" - sed -i -e "s,sonatypeToken=,sonatypeToken=$SONATYPE_TOKEN,g" gradle.properties + sed -i -e "s,sonatypeToken=,sonatypeToken=$SONATYPE_TOKEN_USERNAME,g" gradle.properties SONATYPE_TOKEN_PASSWORD_ESCAPED=$(printf '%s\n' "$SONATYPE_TOKEN_PASSWORD" | sed -e 's/[\/&]/\\&/g') sed -i -e "s,sonatypeTokenPassword=,sonatypeTokenPassword=$SONATYPE_TOKEN_PASSWORD_ESCAPED,g" gradle.properties sed -i -e "s,signing.keyId=,signing.keyId=$GPG_KEY_ID,g" gradle.properties @@ -49,7 +49,7 @@ jobs: GPG_KEY_ID: ${{ secrets.SYNCED_GPG_KEY_ID }} GPG_PASSWORD: ${{ secrets.SYNCED_GPG_KEY_PASSWORD }} SONATYPE_TOKEN_PASSWORD: ${{ secrets.SYNCED_SONATYPE_TOKEN_PASSWORD }} - SONATYPE_TOKEN: ${{ secrets.SYNCED_SONATYPE_TOKEN_USERNAME }} + SONATYPE_TOKEN_USERNAME: ${{ secrets.SYNCED_SONATYPE_TOKEN_USERNAME }} - uses: actions/setup-node@v4 with: From 65d930307a1070ce1559f6e9633b7ae3813e48c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Mon, 24 Jun 2024 17:26:29 +0200 Subject: [PATCH 6/9] chore: modified branch for semantic release, temp --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4d596489b..b32564b63 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ name: Release on: push: - branches: [ main ] + branches: [ update_sonatype_token ] workflow_dispatch: jobs: From 0124a420e3c5d2d79581caecf6e10830a7fc4791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Mon, 24 Jun 2024 17:27:19 +0200 Subject: [PATCH 7/9] chore: modified branch for semantic release, temp --- .releaserc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.releaserc b/.releaserc index 81956d5ba..9c10147ff 100644 --- a/.releaserc +++ b/.releaserc @@ -1,5 +1,5 @@ branches: - - main + - update_sonatype_token plugins: - "@semantic-release/commit-analyzer" - "@semantic-release/release-notes-generator" From e733bba5783413c1f6047d4cc396ef641c10616a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Mon, 24 Jun 2024 17:53:05 +0200 Subject: [PATCH 8/9] chore: modified branch for semantic release, temp --- .github/workflows/release.yml | 2 +- .releaserc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b32564b63..4d596489b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ name: Release on: push: - branches: [ update_sonatype_token ] + branches: [ main ] workflow_dispatch: jobs: diff --git a/.releaserc b/.releaserc index 9c10147ff..fddf78014 100644 --- a/.releaserc +++ b/.releaserc @@ -1,5 +1,5 @@ branches: - - update_sonatype_token + - chore/update_sonatype_token plugins: - "@semantic-release/commit-analyzer" - "@semantic-release/release-notes-generator" From aeb5d71fd9a0d2a0dabd5cf2bfb25dfd322c4a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?= Date: Mon, 24 Jun 2024 18:35:28 +0200 Subject: [PATCH 9/9] chore: modified branch for semantic release, temp --- .releaserc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.releaserc b/.releaserc index fddf78014..81956d5ba 100644 --- a/.releaserc +++ b/.releaserc @@ -1,5 +1,5 @@ branches: - - chore/update_sonatype_token + - main plugins: - "@semantic-release/commit-analyzer" - "@semantic-release/release-notes-generator"