From 88f5edec4a84d680e4d8af52fbf4819a4c11b2cc Mon Sep 17 00:00:00 2001
From: octoshrimpy <octoshrimpy@users.noreply.github.com>
Date: Sun, 26 Nov 2023 13:50:58 -0700
Subject: [PATCH] Update build-and-release.yml

---
 .github/workflows/build-and-release.yml | 121 ++++++++++++------------
 1 file changed, 60 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 4b48b7205..8fdc9deff 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -1,68 +1,67 @@
 name: Build and Release
 
 on:
- push:
-   branches:
-     - master
-   tags:
-     - "v*"
+  push:
+    branches:
+      - master
+    tags:
+      - "v*"
 
 jobs:
- apk:
-   name: Generate APK
-   runs-on: ubuntu-latest
-   steps:
-     - name: Checkout
-       uses: actions/checkout@v3
-     
-     - name: Setup JDK
-       uses: actions/setup-java@v3
-       with:
-         distribution: 'temurin'
-         java-version: '17'
-     
-     - name: Set execution flag for gradlew
-       run: chmod +x gradlew
-     
-     - name: Decode Keystore File
-       run: echo "${{ secrets.KEYSTORE_FILE }}" | base64 -d > my-release-key.keystore
-     
-     - name: Build APK
-       run: ./gradlew assembleDebug \
-         -Pandroid.injected.signing.store.file=my-release-key.keystore \
-         -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \
-         -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \
-         -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} \
-         --stacktrace
-     
-     - name: Rename APK
-       run: mv presentation/build/outputs/apk/noAnalytics/debug/QKSMS-v*-noAnalytics-debug.apk presentation/build/outputs/apk/noAnalytics/debug/QKSMS-noAnalytics-debug.apk
-     
-     - name: Upload APK
-       uses: actions/upload-artifact@v3
-     
-       with:
-         name: apk
-       
-         path: presentation/build/outputs/apk/noAnalytics/debug/QKSMS-noAnalytics-debug.apk
+  apk:
+    name: Generate APK
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      
+      - name: Setup JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      
+      - name: Set execution flag for gradlew
+        run: chmod +x gradlew
+      
+      - name: Decode Keystore File
+        run: echo "${{ secrets.KEYSTORE_FILE }}" | base64 -d > my-release-key.keystore
+      
+      - name: Build APK
+        run: |
+          ./gradlew assembleDebug \
+            -Pandroid.injected.signing.store.file=my-release-key.keystore \
+            -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \
+            -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \
+            -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} \
+            --stacktrace
+      
+      - name: Rename APK
+        run: mv presentation/build/outputs/apk/noAnalytics/debug/QKSMS-v*-noAnalytics-debug.apk presentation/build/outputs/apk/noAnalytics/debug/QKSMS-noAnalytics-debug.apk
+      
+      - name: Upload APK
+        uses: actions/upload-artifact@v3
+        with:
+          name: apk
+          path: presentation/build/outputs/apk/noAnalytics/debug/QKSMS-noAnalytics-debug.apk
 
- release:
-   name: Release APK
-   needs: apk
-   runs-on: ubuntu-latest
-   if: startsWith(github.ref, 'refs/tags/v')
-   steps:
-     - name: Download APK from build
-       uses: actions/download-artifact@v3
-       with:
-         name: apk
-         
-     - name: List files in the APK directory
-       run: ls -Rla ./
+  release:
+    name: Release APK
+    needs: apk
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/v')
+    steps:
+      - name: Download APK from build
+        uses: actions/download-artifact@v3
+        with:
+          name: apk
+          
+      - name: List files in the APK directory
+        run: ls -Rla ./
 
-     - name: Create and upload release
-       uses: softprops/action-gh-release@v1
-       with:
-         files: QKSMS-noAnalytics-debug.apk
-       env:
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create and upload release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: QKSMS-noAnalytics-debug.apk
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}