codeplay-common 4.8.8 → 4.8.9

package/files/buildCodeplay/codeplayBeforeBuild-6.4.js

@@ -1366,7 +1366,7 @@ function syncAndroidCodeOptimization() {
   }
 
   const currentContent = fs.readFileSync(androidAppBuildGradlePath, 'utf8');
-  const nextContent = currentContent.replace(
+  let nextContent = currentContent.replace(
     /getDefaultProguardFile\(\s*(['"])proguard-android\.txt\1\s*\)/g,
     "getDefaultProguardFile('proguard-android-optimize.txt')"
   );
@@ -1375,6 +1375,27 @@ function syncAndroidCodeOptimization() {
     throw new Error('Android code optimisation setup failed: expected default ProGuard configuration was not found.');
   }
 
+  const newline = currentContent.includes('\r\n') ? '\r\n' : '\n';
+  nextContent = nextContent.replace(/^([ \t]*release[ \t]*\{)([\s\S]*?)(?=^[ \t]*\})/m, (match, header, body) => {
+    const comments = body.match(/\/\/[^\r\n]*|\/\*[\s\S]*?\*\//g) || [];
+    if (comments.some(comment => /\bshrinkResources\b/.test(comment))) return match;
+
+    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}${newline}            shrinkResources ${minifyEnabled}${body}`;
+  });
+
+  const propertiesPath = path.join(androidPlatformPath, 'gradle.properties');
+  const properties = fs.readFileSync(propertiesPath, 'utf8');
+  // An explicit false value or a commented setting is an app-specific opt-out.
+  if (!/^[ \t]*[#!]?[ \t]*android\.r8\.optimizedResourceShrinking(?:[ \t]*[=:]|[ \t]+|[ \t]*$)/m.test(properties)) {
+    fs.writeFileSync(propertiesPath, `${properties.trimEnd()}${newline}android.r8.optimizedResourceShrinking=true${newline}`, 'utf8');
+  }
+
   if (nextContent !== currentContent) {
     fs.writeFileSync(androidAppBuildGradlePath, nextContent, 'utf8');
   }
@@ -4343,6 +4364,7 @@ await main();
 Release Notes
 
   6.5
+    Release resource shrinking is 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/files/finalrelease

@@ -748,17 +748,39 @@ function ensureReleaseCodeOptimization() {
     if (!releaseBlock) throw new Error('Release build configuration was not found.');
 
     const releaseContent = currentContent.slice(releaseBlock.start, releaseBlock.end);
-    const optimizedContent = releaseContent.replace(
+    let optimizedContent = releaseContent.replace(
         /getDefaultProguardFile\(\s*(['"])proguard-android\.txt\1\s*\)/g,
         "getDefaultProguardFile('proguard-android-optimize.txt')"
     );
     if (!/getDefaultProguardFile\(\s*(['"])proguard-android-optimize\.txt\1\s*\)/.test(optimizedContent)) {
         throw new Error('Release build must use the optimisation-enabled default ProGuard rules.');
     }
+    const newline = currentContent.includes('\r\n') ? '\r\n' : '\n';
+    // Preserve commented settings and explicit false values as app-specific opt-outs.
+    const comments = optimizedContent.match(/\/\/[^\r\n]*|\/\*[\s\S]*?\*\//g) || [];
+    if (!comments.some(comment => /\bshrinkResources\b/.test(comment))) {
+        const activeContent = optimizedContent.replace(/\/\/[^\r\n]*|\/\*[\s\S]*?\*\//g, '');
+        const shrinkResources = /^[ \t]*minifyEnabled\s*(?:=\s*)?true\b/m.test(activeContent);
+        const shrinkPattern = /^([ \t]*shrinkResources\s*(?:=\s*)?)(true|false)\b/m;
+        if (shrinkPattern.test(optimizedContent)) {
+            if (!shrinkResources) optimizedContent = optimizedContent.replace(shrinkPattern, '$1false');
+        } else {
+            optimizedContent = `${newline}            shrinkResources ${shrinkResources}${optimizedContent}`;
+        }
+    }
     if (optimizedContent !== releaseContent) {
         writeFileSync(gradleFilePath, currentContent.slice(0, releaseBlock.start)
             + optimizedContent + currentContent.slice(releaseBlock.end), 'utf8');
     }
+
+    const propertiesPath = join(__dirname, 'android', 'gradle.properties');
+    const properties = readFileSync(propertiesPath, 'utf8');
+    const propertyPattern = /^[ \t]*[#!]?[ \t]*android\.r8\.optimizedResourceShrinking(?:[ \t]*[=:]|[ \t]+|[ \t]*$)/m;
+    const property = 'android.r8.optimizedResourceShrinking=true';
+    const nextProperties = propertyPattern.test(properties)
+        ? properties
+        : `${properties.trimEnd()}${newline}${property}${newline}`;
+    if (nextProperties !== properties) writeFileSync(propertiesPath, nextProperties, 'utf8');
 }
 
 function signReleaseBundleWithSha256() {
@@ -893,21 +915,23 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
         // Determine desired minify value
         const desiredMinify = !_isffmpegUsed;
 
-        // Check if minifyEnabled is already present
-        if (/minifyEnabled\s+(true|false)/.test(updatedGradleContent)) {
+        // Limit minification changes to release; debug may have its own test settings.
+        const minificationBlock = findGradleBlock(updatedGradleContent, /buildTypes\s*\{[\s\S]*?\brelease\s*/);
+        if (!minificationBlock) {
+            throw new Error('Release build configuration was not found.');
+        }
+        let minificationContent = updatedGradleContent.slice(minificationBlock.start, minificationBlock.end);
+        if (/\bminifyEnabled\s*(?:=\s*)?(true|false)\b/.test(minificationContent)) {
             // Replace existing value with desired
-            updatedGradleContent = updatedGradleContent.replace(/minifyEnabled\s+(true|false)/, `minifyEnabled ${desiredMinify}`);
+            minificationContent = minificationContent.replace(/\bminifyEnabled\s*(?:=\s*)?(true|false)\b/, `minifyEnabled ${desiredMinify}`);
             console.log(`Replaced minifyEnabled with ${desiredMinify}.`);
-        } else if (/buildTypes\s*{[\s\S]*?release\s*{/.test(updatedGradleContent)) {
+        } else {
             // Insert minifyEnabled if not present
-            updatedGradleContent = updatedGradleContent.replace(
-                /(buildTypes\s*{[\s\S]*?release\s*{)/,
-                `$1\n            minifyEnabled ${desiredMinify}`
-            );
+            minificationContent = `\n            minifyEnabled ${desiredMinify}${minificationContent}`;
             console.log(`✅ Inserted minifyEnabled ${desiredMinify} into release block.`);
-        } else {
-            console.log('⚠️ Warning: buildTypes > release block not found. minifyEnabled was not added.');
         }
+        updatedGradleContent = updatedGradleContent.slice(0, minificationBlock.start)
+            + minificationContent + updatedGradleContent.slice(minificationBlock.end);
 
         // Add native debug symbols for release AABs, but leave any existing setting untouched.
         const releaseBlock = findGradleBlock(updatedGradleContent, /buildTypes\s*\{[\s\S]*?\brelease\s*/);

package/package.json

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