From e7cde6dd3b7911def8e447ac46cf93be056034a7 Mon Sep 17 00:00:00 2001
From: Bryan1029384756 <23323626+Bryan1029384756@users.noreply.github.com>
Date: Wed, 18 Feb 2026 18:15:20 -0600
Subject: [PATCH] fix 2

---
 .gitea/workflows/release.yml | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 9b112d6..6581f78 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -115,26 +115,18 @@ jobs:
           const p = 'android/app/build.gradle';
           let g = fs.readFileSync(p, 'utf8');
 
-          const signingBlock = \`
-          android {
-              signingConfigs {
-                  release {
-                      storeFile file(System.getenv('ANDROID_KEYSTORE_FILE') ?: '/dev/null')
-                      storePassword System.getenv('ANDROID_KEYSTORE_PASSWORD') ?: ''
-                      keyAlias System.getenv('ANDROID_KEY_ALIAS') ?: ''
-                      keyPassword System.getenv('ANDROID_KEY_PASSWORD') ?: ''
-                  }
-              }
-          }
-          \`;
+          // 1. Insert signingConfigs block BEFORE buildTypes (so it is defined first)
+          const signingConfigs = '    signingConfigs {\n        release {\n            storeFile file(System.getenv(\"ANDROID_KEYSTORE_FILE\") ?: \"/dev/null\")\n            storePassword System.getenv(\"ANDROID_KEYSTORE_PASSWORD\") ?: \"\"\n            keyAlias System.getenv(\"ANDROID_KEY_ALIAS\") ?: \"\"\n            keyPassword System.getenv(\"ANDROID_KEY_PASSWORD\") ?: \"\"\n        }\n    }\n\n';
 
-          // Append a separate android block with signingConfigs (Gradle merges them)
-          g += signingBlock;
-
-          // Add signingConfig to the release buildType
           g = g.replace(
-            /(buildTypes\\s*\\{[\\s\\S]*?release\\s*\\{)/,
-            '\$1\\n            signingConfig signingConfigs.release'
+            /(\s*)(buildTypes\s*\{)/,
+            signingConfigs + '\$1\$2'
+          );
+
+          // 2. Add signingConfig reference inside release buildType
+          g = g.replace(
+            /(buildTypes\s*\{[\s\S]*?release\s*\{)/,
+            '\$1\n            signingConfig signingConfigs.release'
           );
 
           fs.writeFileSync(p, g);