codeplay-common 4.8.9 → 4.9.0

package/files/buildCodeplay/codeplayBeforeBuild-6.4.js

@@ -1376,15 +1376,29 @@ function syncAndroidCodeOptimization() {
   }
 
   const newline = currentContent.includes('\r\n') ? '\r\n' : '\n';
-  nextContent = nextContent.replace(/^([ \t]*release[ \t]*\{)([\s\S]*?)(?=^[ \t]*\})/m, (match, header, body) => {
+  if (!/^[ \t]*(?:\/\/[ \t]*)?debug[ \t]*\{/m.test(nextContent)) {
+    nextContent = nextContent.replace(/^([ \t]*buildTypes[ \t]*\{)[ \t]*\r?\n/m,
+      `$1${newline}        debug {${newline}            minifyEnabled true${newline}            shrinkResources true${newline}            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'${newline}        }${newline}`);
+  }
+  nextContent = nextContent.replace(/^([ \t]*(debug|release)[ \t]*\{)([\s\S]*?)(?=^[ \t]*\})/gm, (match, header, buildType, body) => {
     const comments = body.match(/\/\/[^\r\n]*|\/\*[\s\S]*?\*\//g) || [];
     if (comments.some(comment => /\bshrinkResources\b/.test(comment))) return match;
 
+    if (buildType === 'debug') {
+      if (!/^[ \t]*minifyEnabled\s*(?:=\s*)?(true|false)\b/m.test(body)
+          && !comments.some(comment => /\bminifyEnabled\b/.test(comment))) {
+        body = `${newline}            minifyEnabled true${body}`;
+      }
+      if (!/^[ \t]*proguardFiles\b/m.test(body)
+          && !comments.some(comment => /\bproguardFiles\b/.test(comment))) {
+        body = `${newline}            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'${body}`;
+      }
+    }
     const activeBody = body.replace(/\/\/[^\r\n]*|\/\*[\s\S]*?\*\//g, '');
     const minifyEnabled = /^[ \t]*minifyEnabled\s*(?:=\s*)?true\b/m.test(activeBody);
     const shrinkPattern = /^([ \t]*shrinkResources\s*(?:=\s*)?)(true|false)\b/m;
     if (shrinkPattern.test(body)) {
-      return minifyEnabled ? match : header + body.replace(shrinkPattern, '$1false');
+      return header + (minifyEnabled ? body : body.replace(shrinkPattern, '$1false'));
     }
     return `${header}${newline}            shrinkResources ${minifyEnabled}${body}`;
   });
@@ -4364,7 +4378,7 @@ await main();
 Release Notes
 
   6.5
-    Release resource shrinking is configured automatically; commented settings and explicit false values preserve app-specific opt-outs.
+    Debug and release resource shrinking are configured automatically; commented settings and explicit false values preserve app-specific opt-outs.
     Android builds use the optimisation-enabled default ProGuard rules without changing minification settings or custom keep rules.
     Kids ad configuration disables iOS ATT prompts and excludes Android AD_ID during builds.
     Non-kids apps retain tracking prompts and normal permission behavior.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeplay-common",
-  "version": "4.8.9",
+  "version": "4.9.0",
   "description": "Common build scripts and files",
   "scripts": {
 	"postinstall": "node scripts/sync-files.js",