From f310e16f7701795087386c2db512c02b2e4e4e1a Mon Sep 17 00:00:00 2001
From: zarazaex69 <zarazaex@tuta.io>
Date: Wed, 8 Apr 2026 09:39:26 +0300
Subject: [PATCH] ci(build): migrate signing configuration to environment
 variables

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 01efb2a2..f4c7ec54 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -91,16 +91,17 @@ jobs:
         encodedString: ${{ secrets.APP_KEYSTORE_BASE64 }}
 
     - name: Build APK
+      env:
+        KEYSTORE_FILE: ${{ steps.android_keystore.outputs.filePath }}
+        KEYSTORE_PASSWORD: ${{ secrets.APP_KEYSTORE_PASSWORD }}
+        KEY_ALIAS: ${{ secrets.APP_KEYSTORE_ALIAS }}
+        KEY_PASSWORD: ${{ secrets.APP_KEY_PASSWORD }}
       run: |
         cd ${{ github.workspace }}/V2rayNG
         echo "sdk.dir=${ANDROID_HOME}" > local.properties
         chmod 755 gradlew
         ./gradlew licenseFdroidReleaseReport
-        ./gradlew assembleRelease \
-          "-Pandroid.injected.signing.store.file=${{ steps.android_keystore.outputs.filePath }}" \
-          "-Pandroid.injected.signing.store.password=${{ secrets.APP_KEYSTORE_PASSWORD }}" \
-          "-Pandroid.injected.signing.key.alias=${{ secrets.APP_KEYSTORE_ALIAS }}" \
-          "-Pandroid.injected.signing.key.password=${{ secrets.APP_KEY_PASSWORD }}"
+        ./gradlew assembleRelease
     
     - name: Upload arm64-v8a APK
       uses: actions/upload-artifact@v7
diff --git a/V2rayNG/app/build.gradle.kts b/V2rayNG/app/build.gradle.kts
index f644af16..1beb9127 100644
--- a/V2rayNG/app/build.gradle.kts
+++ b/V2rayNG/app/build.gradle.kts
@@ -40,13 +40,13 @@ android {
 
     signingConfigs {
         create("release") {
-            val keystorePath = project.findProperty("android.injected.signing.store.file") as String?
+            val keystorePath = System.getenv("KEYSTORE_FILE")
                 ?: "${rootProject.projectDir}/release.keystore"
-            val keystorePassword = project.findProperty("android.injected.signing.store.password") as String?
+            val keystorePassword = System.getenv("KEYSTORE_PASSWORD")
                 ?: "android"
-            val keyAliasName = project.findProperty("android.injected.signing.key.alias") as String?
+            val keyAliasName = System.getenv("KEY_ALIAS")
                 ?: "v2rayng"
-            val keyAliasPassword = project.findProperty("android.injected.signing.key.password") as String?
+            val keyAliasPassword = System.getenv("KEY_PASSWORD")
                 ?: "android"
 
             storeFile = file(keystorePath)