From 963fcc61055e3f1f640e56b9c535b8970bdb7643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?=
 <eenriquelopez@gmail.com>
Date: Tue, 25 Jun 2024 08:57:55 +0200
Subject: [PATCH 1/2] chore: update Sonatype token

---
 .github/workflows/release.yml | 10 +++++-----
 build.gradle                  |  4 ++--
 gradle.properties             |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7b617541..408189d8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,9 +33,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
@@ -43,8 +43,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_PASSWORD: ${{ secrets.SYNCED_SONATYPE_TOKEN_PASSWORD }}
+        SONATYPE_TOKEN: ${{ secrets.SYNCED_SONATYPE_TOKEN }}
 
     - uses: actions/setup-node@v2
       with:
diff --git a/build.gradle b/build.gradle
index dba851b8..ad2ef887 100644
--- a/build.gradle
+++ b/build.gradle
@@ -180,8 +180,8 @@ subprojects { project ->
                 name = "mavencentral"
                 url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
                 credentials {
-                    username sonatypeUsername
-                    password sonatypePassword
+                    username sonatypeToken
+                    password sonatypeTokenPassword
                 }
             }
         }
diff --git a/gradle.properties b/gradle.properties
index 108e7a6d..0f5da65f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,8 +26,8 @@ signing.keyId=
 signing.password=
 signing.secretKeyRingFile=
 android.defaults.buildfeatures.buildconfig=true
-sonatypeUsername=
-sonatypePassword=
+sonatypeToken=
+sonatypeTokenPassword=
 
 # Migration to AGP 8.2.1
 android.nonTransitiveRClass=false

From a5434547898c02163655e81fa04899a2530a06eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enrique=20Lo=CC=81pez=20Man=CC=83as?=
 <eenriquelopez@gmail.com>
Date: Tue, 25 Jun 2024 09:10:38 +0200
Subject: [PATCH 2/2] chore: update Sonatype token

---
 .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 408189d8..26bbdac9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,7 +33,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
@@ -44,7 +44,7 @@ jobs:
         GPG_KEY_ID: ${{ secrets.SYNCED_GPG_KEY_ID }}
         GPG_PASSWORD: ${{ secrets.SYNCED_GPG_KEY_PASSWORD }}
         SONATYPE_PASSWORD: ${{ secrets.SYNCED_SONATYPE_TOKEN_PASSWORD }}
-        SONATYPE_TOKEN: ${{ secrets.SYNCED_SONATYPE_TOKEN }}
+        SONATYPE_TOKEN_USERNAME: ${{ secrets.SYNCED_SONATYPE_TOKEN_USERNAME }}
 
     - uses: actions/setup-node@v2
       with: