codeplay-common 4.9.2 → 4.9.3

package/files/buildCodeplay/codeplayBeforeBuild-6.4.js

@@ -4258,6 +4258,103 @@ function patchFile() {
 
 //##################################  SystemBars.java update for "@capacitor/android": "^8.3.0" plugin END ###############################
 
+// Android build optimization START
+function findAndroidBuildBlock(content, name) {
+  // Mask comments and strings without changing offsets or line endings.
+  const masked = content.replace(/\/\*[\s\S]*?\*\/|\/\/[^\r\n]*|"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'/g,
+    value => value.replace(/[^\r\n]/g, ' '));
+  const header = new RegExp(`\\b${name}\\s*\\{`, 'g');
+  let depth = 0;
+  for (let index = 0; index < masked.length; index += 1) {
+    if (depth === 0) {
+      header.lastIndex = index;
+      const match = header.exec(masked);
+      if (match && match.index === index) {
+        const start = header.lastIndex;
+        let blockDepth = 1;
+        for (let end = start; end < masked.length; end += 1) {
+          if (masked[end] === '{') blockDepth += 1;
+          if (masked[end] === '}' && --blockDepth === 0) return { start, end };
+        }
+        throw new Error(`Unclosed Android Gradle ${name} block.`);
+      }
+    }
+    if (masked[index] === '{') depth += 1;
+    if (masked[index] === '}') depth -= 1;
+  }
+  return null;
+}
+
+function syncAndroidBuildOptimization() {
+  if (buildPlatform !== 'android' || !fs.existsSync(androidAppBuildGradlePath)) return;
+
+  const original = fs.readFileSync(androidAppBuildGradlePath, 'utf8');
+  const newline = original.includes('\r\n') ? '\r\n' : '\n';
+  const androidBlock = findAndroidBuildBlock(original, 'android');
+  if (!androidBlock) throw new Error('Android Gradle android block was not found.');
+  let androidContent = original.slice(androidBlock.start, androidBlock.end);
+  const buildTypesBlock = findAndroidBuildBlock(androidContent, 'buildTypes');
+  if (!buildTypesBlock) throw new Error('Android Gradle buildTypes block was not found.');
+  let buildTypesContent = androidContent.slice(buildTypesBlock.start, buildTypesBlock.end);
+
+  // Match the existing finalrelease compatibility exception for this native plugin.
+  const ffmpegPluginXml = path.join(process.cwd(), 'node_modules', 'codeplay-fmpg', 'plugin.xml');
+  const optimizeRelease = !(fs.existsSync(ffmpegPluginXml)
+    && /<plugin\b/.test(fs.readFileSync(ffmpegPluginXml, 'utf8')));
+
+  for (const name of ['debug', 'release']) {
+    const enabled = name === 'debug' || optimizeRelease;
+    const block = findAndroidBuildBlock(buildTypesContent, name);
+    const blockComments = buildTypesContent.match(/\/\*[\s\S]*?\*\/|\/\/[^\r\n]*|"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'/g) || [];
+    if (!block && blockComments.some(comment => (comment.startsWith('//') || comment.startsWith('/*'))
+      && new RegExp(`\\b${name}\\s*\\{`).test(comment))) continue;
+    let body = block ? buildTypesContent.slice(block.start, block.end) : `${newline}        `;
+    const comments = (body.match(/\/\*[\s\S]*?\*\/|\/\/[^\r\n]*|"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'/g) || [])
+      .filter(value => value.startsWith('//') || value.startsWith('/*'));
+    for (const setting of ['minifyEnabled', 'shrinkResources']) {
+      const masked = body.replace(/\/\*[\s\S]*?\*\/|\/\/[^\r\n]*|"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'/g,
+        value => value.replace(/[^\r\n]/g, ' '));
+      const settingPattern = new RegExp(`\\b${setting}\\b`);
+      // Existing values, expressions and commented opt-outs take precedence.
+      if (settingPattern.test(masked) || comments.some(comment => settingPattern.test(comment))) continue;
+      const value = setting === 'shrinkResources'
+        ? enabled && /\bminifyEnabled\s*(?:=\s*)?true\b/.test(masked)
+        : enabled;
+      body = `${newline}            ${setting} ${value}${body}`;
+    }
+    const activeBody = body.replace(/\/\*[\s\S]*?\*\/|\/\/[^\r\n]*|"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'/g,
+      value => value.startsWith('//') || value.startsWith('/*') ? value.replace(/[^\r\n]/g, ' ') : value);
+    const defaultRules = [...activeBody.matchAll(/getDefaultProguardFile\(\s*(['"])proguard-android\.txt\1\s*\)/g)];
+    for (const match of defaultRules.reverse()) {
+      body = body.slice(0, match.index) + "getDefaultProguardFile('proguard-android-optimize.txt')"
+        + body.slice(match.index + match[0].length);
+    }
+    if (!/\bproguardFiles\b/.test(activeBody)
+      && !comments.some(comment => /\bproguardFiles\b/.test(comment))) {
+      body = `${newline}            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'${body}`;
+    }
+    buildTypesContent = block
+      ? buildTypesContent.slice(0, block.start) + body + buildTypesContent.slice(block.end)
+      : `${buildTypesContent.trimEnd()}${newline}        ${name} {${body}}${newline}    `;
+  }
+
+  androidContent = androidContent.slice(0, buildTypesBlock.start) + buildTypesContent
+    + androidContent.slice(buildTypesBlock.end);
+  const next = original.slice(0, androidBlock.start) + androidContent + original.slice(androidBlock.end);
+  if (next !== original) fs.writeFileSync(androidAppBuildGradlePath, next, 'utf8');
+
+  const propertiesPath = path.join(androidPlatformPath, 'gradle.properties');
+  const properties = fs.existsSync(propertiesPath) ? fs.readFileSync(propertiesPath, 'utf8') : '';
+  const property = 'android.r8.optimizedResourceShrinking=true';
+  const propertyPattern = /^[ \t]*[#!]?[ \t]*android\.r8\.optimizedResourceShrinking(?:[ \t]*[=:]|[ \t]+|[ \t]*$)/m;
+  const nextProperties = propertyPattern.test(properties)
+    ? properties
+    : `${properties.trimEnd()}${newline}${property}${newline}`;
+  if (nextProperties !== properties) fs.writeFileSync(propertiesPath, nextProperties, 'utf8');
+  console.log('✅ Android build optimization defaults checked; existing settings and commented opt-outs preserved.');
+}
+// Android build optimization END
+
 async function main() {
   validateThemeFolderLocation();
   validateAndRestoreSignDetails();
@@ -4276,6 +4373,7 @@ async function main() {
   checkAndupdateDropInViteConfig();
   checkAdmobConfigurationProperty();
   syncAndroidAdIdPermission();
+  syncAndroidBuildOptimization();
 }
 
 await main();
@@ -4291,6 +4389,8 @@ await main();
 Release Notes
 
   6.5
+    Enable debug/release optimization and optimized resource shrinking before Android builds.
+    Preserve existing values and commented opt-outs without adding duplicate settings.
     Kids ad configuration disables iOS ATT prompts and excludes Android AD_ID during builds.
     Non-kids apps retain tracking prompts and normal permission behavior.
     Ad configuration migration preserves newer local configuration versions.

package/package.json

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