From 3e1bb8ee0cf12fe53905d8379ef42caccc3ed715 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Tue, 10 Jun 2025 23:40:23 -0700
Subject: [PATCH 1/2] Fix Google Play

---
 .github/workflows/release.yaml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 8eec1f2..bdc2bc7 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -149,13 +149,22 @@ jobs:
             "${{ env.apk_path }}/${{ env.apk_file }}"
           apksigner verify --verbose "${{ env.apk_path }}/${{ env.apk_file }}"
 
-      - name: "Upload APK Artifacts"
+      - name: "Upload APK to Artifacts"
         if: ${{ !github.event.act }}
         uses: actions/upload-artifact@v4
         with:
           name: release
           path: ${{ env.apk_path }}
 
+      - name: "Upload APK to Release"
+        if: ${{ github.event_name == 'release' }}
+        uses: svenstaro/upload-release-action@v2
+        with:
+          file: ${{ env.apk_path }}/${{ env.apk_file }}
+          tag: ${{ github.ref }}
+          overwrite: true
+          file_glob: true
+
       - name: "Gradle Bundle AAB"
         if: ${{ !github.event.release.prerelease }}
         run: |
@@ -183,7 +192,7 @@ jobs:
             --ks-key-alias ${{ env.key_name }} \
             "${{ env.aab_path }}/${{ env.aab_file }}"
 
-      - name: "Upload Bundle Artifacts"
+      - name: "Upload Bundle to Artifacts"
         if: ${{ !github.event.release.prerelease }}
         uses: actions/upload-artifact@v4
         with:
@@ -201,7 +210,7 @@ jobs:
         if: ${{ github.event_name == 'release' && !github.event.release.prerelease }}
         uses: r0adkll/upload-google-play@v1
         with:
-          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+          serviceAccountJsonPlainText: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_JSON }}
           packageName: ${{ env.package_name }}
           releaseFiles: ${{ env.aab_path }}/${{ env.aab_file }}
           mappingFile: ${{ env.mapping_file }}
@@ -210,15 +219,6 @@ jobs:
           releaseName: "${{ github.run_number }} (${{ github.ref_name }})"
           track: qa
 
-      - name: "Upload to Release"
-        if: ${{ github.event_name == 'release' }}
-        uses: svenstaro/upload-release-action@v2
-        with:
-          file: ${{ env.apk_path }}/${{ env.apk_file }}
-          tag: ${{ github.ref }}
-          overwrite: true
-          file_glob: true
-
       - name: "VirusTotal"
         if: ${{ github.event_name == 'release' }}
         uses: cssnr/virustotal-action@v1

From 94efe1b9f97b442ec7479bc3097220bec21ad2d9 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Tue, 10 Jun 2025 23:46:43 -0700
Subject: [PATCH 2/2] Cleanup

---
 .github/workflows/release.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index bdc2bc7..23ab7df 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -177,9 +177,10 @@ jobs:
         run: |
           echo "env.aab_path: ${{ env.aab_path }}"
           ls -lAh ${{ env.aab_path }} ||:
-          ls -lAh app/build/outputs/mapping/release ||:
-          ls -lAh app/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib ||:
-          stat app/build/outputs/mapping/release/mapping.txt
+          echo "env.debug_symbols: ${{ env.debug_symbols }}"
+          ls -lAh ${{ env.debug_symbols }} ||:
+          echo "env.mapping_file: ${{ env.mapping_file }}"
+          ls -lAh $(dirname ${{ env.debug_symbols }}) ||:
 
       - name: "Sign Bundle"
         if: ${{ !github.event.release.prerelease }}
@@ -213,8 +214,8 @@ jobs:
           serviceAccountJsonPlainText: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_JSON }}
           packageName: ${{ env.package_name }}
           releaseFiles: ${{ env.aab_path }}/${{ env.aab_file }}
-          mappingFile: ${{ env.mapping_file }}
           debugSymbols: ${{ env.debug_symbols }}
+          mappingFile: ${{ env.mapping_file }}
           whatsNewDirectory: whatsNew
           releaseName: "${{ github.run_number }} (${{ github.ref_name }})"
           track: qa