Allow generated debug signed apk, and rename keystore props:

- RELEASE_STORE_FILE ==> KEY_STORE_FILE - KEY_STORE_PASSWORD ==> KEY_STORE_PASSWORD - RELEASE_KEY_ALIAS ==> KEY_ALIAS - RELEASE_KEY_PASSWORD ==> KEY_PASSWORD
simdsoft · Jan 16, 2024 · bef10d0 · bef10d0
1 parent 32ef79a
commit bef10d0
Show file tree

Hide file tree

Showing 14 changed files with 103 additions and 85 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -115,8 +115,13 @@
 - Improve cmake scripts for managing 3rd libs
 - Add `Get TMXTilesetInfo` by name support by @lich426
 - Include hpp and c files in CMakeLists.txt of cpp template by @@lich426
-- Improve Gradle Scripts, onfig each build-variants for easy add custom build-variant, refer #1571
+- Improve gradle scripts, config each build-variants for easy add custom build-variant, refer #1571
 - Allow to override AX_USE_COMPAT_GL from user's `CMakeLists.txt` by @smilediver
+- Allow generated debug signed apk, and rename keystore props:
+  - RELEASE_STORE_FILE ==> KEY_STORE_FILE
+  - KEY_STORE_PASSWORD ==> KEY_STORE_PASSWORD
+  - RELEASE_KEY_ALIAS ==> KEY_ALIAS
+  - RELEASE_KEY_PASSWORD ==> KEY_PASSWORD
 
 ### Break changes
 

diff --git a/build.ps1 b/build.ps1
@@ -175,7 +175,7 @@ if (!$use_gradle) {
 } else { # android gradle
     # engine ci
     if ($is_engine) {
-        $options.xc += "-PRELEASE_STORE_FILE=$AX_ROOT/tools/ci/axmol-ci.jks", '-PRELEASE_STORE_PASSWORD=axmol-ci', '-PRELEASE_KEY_ALIAS=axmol-ci', '-PRELEASE_KEY_PASSWORD=axmol-ci'
+        $options.xc += "-PKEY_STORE_FILE=$AX_ROOT/tools/ci/axmol-ci.jks", '-PKEY_STORE_PASSWORD=axmol-ci', '-PKEY_ALIAS=axmol-ci', '-PKEY_PASSWORD=axmol-ci'
     }
 }
 

diff --git a/templates/cpp-template-default/proj.android/app/build.gradle b/templates/cpp-template-default/proj.android/app/build.gradle
@@ -50,13 +50,12 @@ android {
     }
 
     signingConfigs {
-
-       release {
-            if (project.hasProperty("RELEASE_STORE_FILE")) {
-                storeFile file(RELEASE_STORE_FILE)
-                storePassword RELEASE_STORE_PASSWORD
-                keyAlias RELEASE_KEY_ALIAS
-                keyPassword RELEASE_KEY_PASSWORD
+       common {
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                storeFile file(KEY_STORE_FILE)
+                storePassword KEY_STORE_PASSWORD
+                keyAlias KEY_ALIAS
+                keyPassword KEY_PASSWORD
             }
         }
     }
@@ -69,15 +68,18 @@ android {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            if (project.hasProperty("RELEASE_STORE_FILE")) {
-                signingConfig signingConfigs.release
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                signingConfig signingConfigs.common
             }
         }
 
         debug {
             debuggable true
             jniDebuggable true
             renderscriptDebuggable true
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                signingConfig signingConfigs.common
+            }
         }
     }
 

diff --git a/templates/cpp-template-default/proj.android/gradle.properties b/templates/cpp-template-default/proj.android/gradle.properties
@@ -31,11 +31,11 @@ PROP_TARGET_SDK_VERSION=34
 # Example - PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86
 PROP_APP_ABI=arm64-v8a
 
-# uncomment it and fill in sign information for release mode
-#RELEASE_STORE_FILE=file path of keystore
-#RELEASE_STORE_PASSWORD=password of keystore
-#RELEASE_KEY_ALIAS=alias of key
-#RELEASE_KEY_PASSWORD=password of key
+# uncomment it and fill in sign information for generate signed apk
+#KEY_STORE_FILE=file path of keystore
+#KEY_STORE_PASSWORD=password of keystore
+#KEY_ALIAS=alias of key
+#KEY_PASSWORD=password of key
 
 android.injected.testOnly=false
 android.useAndroidX=true

diff --git a/templates/lua-template-default/proj.android/app/build.gradle b/templates/lua-template-default/proj.android/app/build.gradle
@@ -50,12 +50,12 @@ android {
     }
 
     signingConfigs {
-       release {
-            if (project.hasProperty("RELEASE_STORE_FILE")) {
-                storeFile file(RELEASE_STORE_FILE)
-                storePassword RELEASE_STORE_PASSWORD
-                keyAlias RELEASE_KEY_ALIAS
-                keyPassword RELEASE_KEY_PASSWORD
+       common {
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                storeFile file(KEY_STORE_FILE)
+                storePassword KEY_STORE_PASSWORD
+                keyAlias KEY_ALIAS
+                keyPassword KEY_PASSWORD
             }
         }
     }
@@ -68,15 +68,18 @@ android {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            if (project.hasProperty("RELEASE_STORE_FILE")) {
-                signingConfig signingConfigs.release
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                signingConfig signingConfigs.common
             }
         }
 
         debug {
             debuggable true
             jniDebuggable true
             renderscriptDebuggable true
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                signingConfig signingConfigs.common
+            }
         }
     }
 

diff --git a/templates/lua-template-default/proj.android/gradle.properties b/templates/lua-template-default/proj.android/gradle.properties
@@ -31,11 +31,11 @@ PROP_TARGET_SDK_VERSION=34
 # Example - PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86
 PROP_APP_ABI=arm64-v8a
 
-# uncomment it and fill in sign information for release mode
-#RELEASE_STORE_FILE=file path of keystore
-#RELEASE_STORE_PASSWORD=password of keystore
-#RELEASE_KEY_ALIAS=alias of key
-#RELEASE_KEY_PASSWORD=password of key
+# uncomment it and fill in sign information for generate signed apk
+#KEY_STORE_FILE=file path of keystore
+#KEY_STORE_PASSWORD=password of keystore
+#KEY_ALIAS=alias of key
+#KEY_PASSWORD=password of key
 
 android.injected.testOnly=false
 android.useAndroidX=true

diff --git a/tests/cpp-tests/proj.android/app/build.gradle b/tests/cpp-tests/proj.android/app/build.gradle
@@ -51,13 +51,12 @@ android {
     }
 
     signingConfigs {
-
-       release {
-            if (project.hasProperty("RELEASE_STORE_FILE")) {
-                storeFile file(RELEASE_STORE_FILE)
-                storePassword RELEASE_STORE_PASSWORD
-                keyAlias RELEASE_KEY_ALIAS
-                keyPassword RELEASE_KEY_PASSWORD
+       common {
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                storeFile file(KEY_STORE_FILE)
+                storePassword KEY_STORE_PASSWORD
+                keyAlias KEY_ALIAS
+                keyPassword KEY_PASSWORD
             }
         }
     }
@@ -70,15 +69,18 @@ android {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            if (project.hasProperty("RELEASE_STORE_FILE")) {
-                signingConfig signingConfigs.release
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                signingConfig signingConfigs.common
             }
         }
 
         debug {
             debuggable true
             jniDebuggable true
             renderscriptDebuggable true
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                signingConfig signingConfigs.common
+            }
         }
     }
 

diff --git a/tests/cpp-tests/proj.android/gradle.properties b/tests/cpp-tests/proj.android/gradle.properties
@@ -31,11 +31,11 @@ PROP_TARGET_SDK_VERSION=34
 # Example - PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86
 PROP_APP_ABI=arm64-v8a
 
-# uncomment it and fill in sign information for release mode
-#RELEASE_STORE_FILE=file path of keystore
-#RELEASE_STORE_PASSWORD=password of keystore
-#RELEASE_KEY_ALIAS=alias of key
-#RELEASE_KEY_PASSWORD=password of key
+# uncomment it and fill in sign information for generate signed apk
+#KEY_STORE_FILE=file path of keystore
+#KEY_STORE_PASSWORD=password of keystore
+#KEY_ALIAS=alias of key
+#KEY_PASSWORD=password of key
 
 android.injected.testOnly=false
 android.useAndroidX=true

diff --git a/tests/fairygui-tests/proj.android/app/build.gradle b/tests/fairygui-tests/proj.android/app/build.gradle
@@ -52,13 +52,12 @@ android {
     }
 
     signingConfigs {
-
-       release {
-            if (project.hasProperty("RELEASE_STORE_FILE")) {
-                storeFile file(RELEASE_STORE_FILE)
-                storePassword RELEASE_STORE_PASSWORD
-                keyAlias RELEASE_KEY_ALIAS
-                keyPassword RELEASE_KEY_PASSWORD
+       common {
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                storeFile file(KEY_STORE_FILE)
+                storePassword KEY_STORE_PASSWORD
+                keyAlias KEY_ALIAS
+                keyPassword KEY_PASSWORD
             }
         }
     }
@@ -71,15 +70,18 @@ android {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            if (project.hasProperty("RELEASE_STORE_FILE")) {
-                signingConfig signingConfigs.release
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                signingConfig signingConfigs.common
             }
         }
 
         debug {
             debuggable true
             jniDebuggable true
             renderscriptDebuggable true
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                signingConfig signingConfigs.common
+            }
         }
     }
 

diff --git a/tests/fairygui-tests/proj.android/gradle.properties b/tests/fairygui-tests/proj.android/gradle.properties
@@ -31,11 +31,11 @@ PROP_TARGET_SDK_VERSION=34
 # Example - PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86
 PROP_APP_ABI=arm64-v8a
 
-# uncomment it and fill in sign information for release mode
-#RELEASE_STORE_FILE=file path of keystore
-#RELEASE_STORE_PASSWORD=password of keystore
-#RELEASE_KEY_ALIAS=alias of key
-#RELEASE_KEY_PASSWORD=password of key
+# uncomment it and fill in sign information for generate signed apk
+# KEY_STORE_FILE=path/to/keystore.jks
+# KEY_STORE_PASSWORD=axmol-ci
+# KEY_ALIAS=axmol-ci
+# KEY_PASSWORD=axmol-ci
 
 android.injected.testOnly=false
 android.useAndroidX=true

diff --git a/tests/live2d-tests/proj.android/app/build.gradle b/tests/live2d-tests/proj.android/app/build.gradle
@@ -51,13 +51,12 @@ android {
     }
 
     signingConfigs {
-
-       release {
-            if (project.hasProperty("RELEASE_STORE_FILE")) {
-                storeFile file(RELEASE_STORE_FILE)
-                storePassword RELEASE_STORE_PASSWORD
-                keyAlias RELEASE_KEY_ALIAS
-                keyPassword RELEASE_KEY_PASSWORD
+       common {
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                storeFile file(KEY_STORE_FILE)
+                storePassword KEY_STORE_PASSWORD
+                keyAlias KEY_ALIAS
+                keyPassword KEY_PASSWORD
             }
         }
     }
@@ -70,15 +69,18 @@ android {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            if (project.hasProperty("RELEASE_STORE_FILE")) {
-                signingConfig signingConfigs.release
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                signingConfig signingConfigs.common
             }
         }
 
         debug {
             debuggable true
             jniDebuggable true
             renderscriptDebuggable true
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                signingConfig signingConfigs.common
+            }
         }
     }
 

diff --git a/tests/live2d-tests/proj.android/gradle.properties b/tests/live2d-tests/proj.android/gradle.properties
@@ -31,11 +31,11 @@ PROP_TARGET_SDK_VERSION=34
 # Example - PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86
 PROP_APP_ABI=arm64-v8a
 
-# uncomment it and fill in sign information for release mode
-#RELEASE_STORE_FILE=file path of keystore
-#RELEASE_STORE_PASSWORD=password of keystore
-#RELEASE_KEY_ALIAS=alias of key
-#RELEASE_KEY_PASSWORD=password of key
+# uncomment it and fill in sign information for generate signed apk
+#KEY_STORE_FILE=file path of keystore
+#KEY_STORE_PASSWORD=password of keystore
+#KEY_ALIAS=alias of key
+#KEY_PASSWORD=password of key
 
 android.injected.testOnly=false
 android.useAndroidX=true

diff --git a/tests/lua-tests/proj.android/app/build.gradle b/tests/lua-tests/proj.android/app/build.gradle
@@ -51,13 +51,12 @@ android {
     }
 
     signingConfigs {
-
-       release {
-            if (project.hasProperty("RELEASE_STORE_FILE")) {
-                storeFile file(RELEASE_STORE_FILE)
-                storePassword RELEASE_STORE_PASSWORD
-                keyAlias RELEASE_KEY_ALIAS
-                keyPassword RELEASE_KEY_PASSWORD
+       common {
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                storeFile file(KEY_STORE_FILE)
+                storePassword KEY_STORE_PASSWORD
+                keyAlias KEY_ALIAS
+                keyPassword KEY_PASSWORD
             }
         }
     }
@@ -70,15 +69,18 @@ android {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            if (project.hasProperty("RELEASE_STORE_FILE")) {
-                signingConfig signingConfigs.release
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                signingConfig signingConfigs.common
             }
         }
 
         debug {
             debuggable true
             jniDebuggable true
             renderscriptDebuggable true
+            if (project.hasProperty("KEY_STORE_FILE")) {
+                signingConfig signingConfigs.common
+            }
         }
     }
 

diff --git a/tests/lua-tests/proj.android/gradle.properties b/tests/lua-tests/proj.android/gradle.properties
@@ -31,11 +31,11 @@ PROP_TARGET_SDK_VERSION=34
 # Example - PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86
 PROP_APP_ABI=arm64-v8a
 
-# uncomment it and fill in sign information for release mode
-#RELEASE_STORE_FILE=file path of keystore
-#RELEASE_STORE_PASSWORD=password of keystore
-#RELEASE_KEY_ALIAS=alias of key
-#RELEASE_KEY_PASSWORD=password of key
+# uncomment it and fill in sign information for generate signed apk
+#KEY_STORE_FILE=file path of keystore
+#KEY_STORE_PASSWORD=password of keystore
+#KEY_ALIAS=alias of key
+#KEY_PASSWORD=password of key
 
 android.injected.testOnly=false
 android.useAndroidX=true