From 1642c4a249240d8d82053980fd953866ce2fdabb Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Fri, 2 Feb 2024 19:13:55 +0800
Subject: [PATCH] =?UTF-8?q?chore(CI):=20=E6=97=A0=E7=AD=BE=E5=90=8D?=
 =?UTF-8?q?=E6=97=B6=E4=BD=BF=E7=94=A8=20debug=20=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml |  8 ++++----
 app/build.gradle.kts        | 10 +++++-----
 settings.gradle.kts         |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 94b74225..c273e538 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,10 +30,10 @@ jobs:
         if: ${{ github.event_name != 'pull_request' || github.ref_type == 'tag' }}
         run: |
           if [ -n "${{ secrets.RELEASEKEYPASSWORD }}" ]; then
-            echo releaseKeyAlias="${{ vars.RELEASE_KEY_ALIAS }}" >> keystore.properties
-            echo releaseKeyPassword="${{ secrets.RELEASEKEYPASSWORD }}" >> keystore.properties
-            echo releaseKeyStore="${{ vars.RELEASE_KEYSTORE }}" >> keystore.properties
-            echo releaseStorePassword="${{ secrets.RELEASESTOREPASSWORD }}" >> keystore.properties
+            echo keystore.file="${{ vars.RELEASE_KEYSTORE }}" >> keystore.properties
+            echo keystore.password="${{ secrets.RELEASESTOREPASSWORD }}" >> keystore.properties
+            echo keystore.key.alias="${{ vars.RELEASE_KEY_ALIAS }}" >> keystore.properties
+            echo keystore.key.password="${{ secrets.RELEASEKEYPASSWORD }}" >> keystore.properties
           fi
 
       - name: Setup Gradle
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 76a63683..c2d905b5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -54,12 +54,12 @@ android {
         compose = true
     }
     signingConfigs {
-        if (property.releaseKeyStore.isNotEmpty()) {
+        if (property.keystore.file.isNotBlank()) {
             val config by creating {
-                keyAlias = property.releaseKeyAlias
-                keyPassword = property.releaseKeyPassword
-                storeFile = file(File(rootDir, property.releaseKeyStore))
-                storePassword = property.releaseStorePassword
+                storeFile = file(File(rootDir, property.keystore.file))
+                storePassword = property.keystore.password
+                keyAlias = property.keystore.key.alias
+                keyPassword = property.keystore.key.password
                 enableV3Signing = true
                 enableV4Signing = true
             }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 44cdc3c6..7cb15465 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,7 +26,7 @@ sweetProperty {
                 isAddDefault = true
             )
             permanentKeyValues(
-                "releaseKeyStore" to ""
+                "keystore.file" to ""
             )
             generateFrom(CURRENT_PROJECT, ROOT_PROJECT)
         }