Merge branch '4.0-dev' into 4.0-dev

HuanCheng65 · Feb 2, 2024 · c7a833c · c7a833c
2 parents 1bccf4f + 1642c4a
commit c7a833c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,10 +22,10 @@ jobs:
         run: |
           if [ -n "${{ secrets.RELEASEKEYPASSWORD }}" ]; then
             echo ${{ secrets.KEYSTORE }} | base64 --decode > ${{ vars.RELEASE_KEYSTORE }}
-            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
@@ -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
@@ -26,7 +26,7 @@ sweetProperty {
                 isAddDefault = true
             )
             permanentKeyValues(
-                "releaseKeyStore" to ""
+                "keystore.file" to ""
             )
             generateFrom(CURRENT_PROJECT, ROOT_PROJECT)
         }