Merge branch 'main' of https://github.com/acffordyce973/PSO2-Alert-Android

Marge latest changes.

Author: acffordyce973

.github/workflows/github-actions.yml

@@ -6,16 +6,16 @@ jobs:
   build_release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.6.0
+      - uses: actions/checkout@v6
 
       - name: Setup JAVA 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'corretto'
           java-version: 11
 
       - name: Cache Gradle and wrapper
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -29,22 +29,22 @@ jobs:
 
         run: |
           echo $ENCODED_STRING > keystore-b64.txt
-          base64 -d keystore-b64.txt > $SIGNING_KEY_STORE_PATH
+          base64 -i -d keystore-b64.txt > $SIGNING_KEY_STORE_PATH
 
       - name: Decode Properties
         env:
           ENCODED_STRING: ${{ secrets.KEYSTORE_PROPERTIES_BASE64 }}
-          SIGNING_KEY_STORE_PATH: ${{ secrets.KEYSTORE_PROPERTIES_PATH }}
+          SIGNING_PROPERTIES_STORE_PATH: ${{ secrets.KEYSTORE_PROPERTIES_PATH }}
 
         run: |
-          echo $ENCODED_STRING > keystore-b64.txt
-          base64 -d keystore-b64.txt > $SIGNING_KEY_STORE_PATH
+          echo $ENCODED_STRING > properties-b64.txt
+          base64 -i -d properties-b64.txt > $SIGNING_PROPERTIES_STORE_PATH
 
       - name: Build Release apk
         run: ./gradlew assembleRelease
 
       - name: Upload Release Build to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v6
         with:
           name: release-artifacts
           paths: |