Polish workflow

Author: w2sv

.github/signing_setup.sh

@@ -16,5 +16,5 @@ decode_env_to_file() {
   fi
 }
 
-decode_env_to_file "SIGNING_KEYSTORE" "../keys.jks"
-decode_env_to_file "SIGNING_PROPERTIES" "../keys.properties"
+decode_env_to_file "SIGNING_KEYSTORE" "keys.jks"
+decode_env_to_file "SIGNING_PROPERTIES" "keys.properties"

.github/workflows/gh_apk_release.yaml

@@ -1,9 +1,10 @@
+name: Create GitHub APK Release
 on: workflow_dispatch
 
 env:
     GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -XX:MaxMetaspaceSize=1g -Xms512m -XX:+HeapDumpOnOutOfMemoryError"
-    SIGNING_KEYSTORE_PLAY: ${{ secrets.SIGNING_KEYSTORE }}
-    SIGNING_PROPERTIES_PLAY: ${{ secrets.SIGNING_PROPERTIES }}
+    SIGNING_KEYSTORE: ${{ secrets.SIGNING_KEYSTORE }}
+    SIGNING_PROPERTIES: ${{ secrets.SIGNING_PROPERTIES }}
 
 jobs:
     build:
@@ -18,7 +19,7 @@ jobs:
                     distribution: temurin
 
             -   name: Setup Signing
-                run: .github/signing_setup.sh
+                run: chmod +x .github/signing_setup.sh && .github/signing_setup.sh
 
             -   name: Build release APK
                 run: ./gradlew assembleRelease
@@ -28,7 +29,7 @@ jobs:
                 run: echo "VERSION=$(grep -Po '^version=\K.*' gradle.properties)" >> $GITHUB_OUTPUT
 
             -   name: Create Github Release
-                uses: softprops/action-gh-release@v1
+                uses: softprops/action-gh-release@v2
                 with:
                     tag_name: ${{ steps.version.outputs.VERSION }}
                     files: app/build/outputs/apk/release/${{ steps.version.outputs.VERSION }}.apk

app/build.gradle.kts

@@ -23,15 +23,12 @@ android {
     }
     signingConfigs {
         create("release") {
-            val keystorePropertiesFile = rootProject.file("keystore.properties")
-            if (keystorePropertiesFile.exists()) {
-                val keystoreProperties = Properties().apply { load(FileInputStream(keystorePropertiesFile)) }
-
-                storeFile = rootProject.file("keys.jks")
-                storePassword = keystoreProperties["storePassword"] as String
-                keyAlias = keystoreProperties["keyAlias"] as String
-                keyPassword = keystoreProperties["keyPassword"] as String
-            }
+            val keystoreProperties = Properties()
+                .apply { load(FileInputStream(rootProject.file("keystore.properties"))) }
+            storeFile = rootProject.file("keys.jks")
+            storePassword = keystoreProperties["storePassword"] as String
+            keyAlias = keystoreProperties["keyAlias"] as String
+            keyPassword = keystoreProperties["keyPassword"] as String
         }
     }
     buildTypes {
@@ -46,7 +43,6 @@ android {
                 "proguard-rules.pro"
             )
             // isDebuggable = true
-            signingConfig = signingConfigs.getByName("release")
         }
     }
     buildFeatures {