codeplay-common 4.8.7 → 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

@@ -7,7 +7,7 @@ node finalrelease "1,2,7"
 
 import { existsSync, readFileSync, readdirSync, promises, constants, writeFileSync, unlinkSync, mkdirSync, renameSync } from 'fs';
 import { join, resolve } from 'path';
-import { execSync, execFileSync } from 'child_process';
+import { execSync, execFileSync } from 'child_process';
 import { createInterface } from 'readline';
 
 import { fileURLToPath } from 'url';
@@ -179,49 +179,49 @@ const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
 
 const _appUniqueId = config.android?.APP_UNIQUE_ID;
 const _appName=config.appName;
-const _appPackageId=config.appId;
-
-const releaseSyncConfigPath = join(__dirname, 'buildCodeplay', 'release-sync.config.json');
-let releaseSyncConfig = {};
-if (existsSync(releaseSyncConfigPath)) {
-    try {
-        releaseSyncConfig = JSON.parse(readFileSync(releaseSyncConfigPath, 'utf8'));
-    } catch (error) {
-        console.warn(`⚠️ Could not read ${releaseSyncConfigPath}: ${error.message}`);
-    }
-}
-const RELEASE_SYNC_URL = process.env.CODEPLAY_RELEASE_SYNC_URL || releaseSyncConfig.url || 'https://htmlcodeplay.com/codeplay/api/v1/release/sync';
-const RELEASE_SYNC_TOKEN = process.env.CODEPLAY_RELEASE_SYNC_TOKEN || releaseSyncConfig.token || '';
-const RELEASE_PLATFORM_IDS = { PlayStore: 1, SamsungStore: 13, AmazonStore: 17, MiStore: 15, HuaweiStore: 12, OppoStore: 14, VivoStore: 16 };
-
-function syncReleaseToCodeplay(storeName, finalVersionName, finalVersionCode, releasedDate) {
-    if (!RELEASE_SYNC_TOKEN) {
-        console.warn(`⚠️ Codeplay release sync skipped: add a token to ${releaseSyncConfigPath}.`);
-        return;
-    }
-    const payload = JSON.stringify({
-        app_name: _appName,
-        package_id: _appPackageId,
-        version_name: String(finalVersionName),
-        version_code: String(finalVersionCode),
-        released_date: releasedDate,
-        language_id: 0,
-        language_name: 'Capacitor+ Framework 7',
-        notes: 'Automated release update',
-        status: 1,
-        folder_name: path.basename(process.cwd()),
-        app_unique_id: String(_appUniqueId || ''),
-        platform_id: RELEASE_PLATFORM_IDS[storeName],
-    });
-    try {
-        const response = execFileSync('curl.exe', ['-sS', '--fail-with-body', '-X', 'POST', RELEASE_SYNC_URL,
-            '-H', 'Content-Type: application/json', '-H', `X-Release-Token: ${RELEASE_SYNC_TOKEN}`, '--data-binary', payload],
-            { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] });
-        console.log(`✅ Codeplay sync (${storeName}): ${response.trim()}`);
-    } catch (error) {
-        console.warn(`⚠️ Codeplay sync failed for ${storeName}; continuing release builds: ${error.message}`);
-    }
-}
+const _appPackageId=config.appId;
+
+const releaseSyncConfigPath = join(__dirname, 'buildCodeplay', 'release-sync.config.json');
+let releaseSyncConfig = {};
+if (existsSync(releaseSyncConfigPath)) {
+    try {
+        releaseSyncConfig = JSON.parse(readFileSync(releaseSyncConfigPath, 'utf8'));
+    } catch (error) {
+        console.warn(`⚠️ Could not read ${releaseSyncConfigPath}: ${error.message}`);
+    }
+}
+const RELEASE_SYNC_URL = process.env.CODEPLAY_RELEASE_SYNC_URL || releaseSyncConfig.url || 'https://htmlcodeplay.com/codeplay/api/v1/release/sync';
+const RELEASE_SYNC_TOKEN = process.env.CODEPLAY_RELEASE_SYNC_TOKEN || releaseSyncConfig.token || '';
+const RELEASE_PLATFORM_IDS = { PlayStore: 1, SamsungStore: 13, AmazonStore: 17, MiStore: 15, HuaweiStore: 12, OppoStore: 14, VivoStore: 16 };
+
+function syncReleaseToCodeplay(storeName, finalVersionName, finalVersionCode, releasedDate) {
+    if (!RELEASE_SYNC_TOKEN) {
+        console.warn(`⚠️ Codeplay release sync skipped: add a token to ${releaseSyncConfigPath}.`);
+        return;
+    }
+    const payload = JSON.stringify({
+        app_name: _appName,
+        package_id: _appPackageId,
+        version_name: String(finalVersionName),
+        version_code: String(finalVersionCode),
+        released_date: releasedDate,
+        language_id: 0,
+        language_name: 'Capacitor+ Framework 7',
+        notes: 'Automated release update',
+        status: 1,
+        folder_name: path.basename(process.cwd()),
+        app_unique_id: String(_appUniqueId || ''),
+        platform_id: RELEASE_PLATFORM_IDS[storeName],
+    });
+    try {
+        const response = execFileSync('curl.exe', ['-sS', '--fail-with-body', '-X', 'POST', RELEASE_SYNC_URL,
+            '-H', 'Content-Type: application/json', '-H', `X-Release-Token: ${RELEASE_SYNC_TOKEN}`, '--data-binary', payload],
+            { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] });
+        console.log(`✅ Codeplay sync (${storeName}): ${response.trim()}`);
+    } catch (error) {
+        console.warn(`⚠️ Codeplay sync failed for ${storeName}; continuing release builds: ${error.message}`);
+    }
+}
 
 const FLOWCHART_API_APP_ID = 228;
 const FLOWCHART_SHARED_PATH = join('public', 'src', 'shared.js');
@@ -742,6 +742,93 @@ function findGradleBlock(content, headerPattern) {
     return null;
 }
 
+function ensureReleaseCodeOptimization() {
+    const currentContent = readFileSync(gradleFilePath, 'utf8');
+    const releaseBlock = findGradleBlock(currentContent, /buildTypes\s*\{[\s\S]*?\brelease\s*/);
+    if (!releaseBlock) throw new Error('Release build configuration was not found.');
+
+    const releaseContent = currentContent.slice(releaseBlock.start, releaseBlock.end);
+    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() {
+    const buildOptions = readCapacitorConfig().android?.buildOptions;
+    if (!buildOptions?.keystorePath || !buildOptions.keystorePassword
+        || !buildOptions.keystoreAlias || !buildOptions.keystoreAliasPassword) {
+        throw new Error('Android AAB signing requires the existing keystore path, alias and passwords.');
+    }
+
+    const keystorePath = resolve(__dirname, 'android', buildOptions.keystorePath);
+    const bundleDirectory = join(__dirname, 'android', 'app', 'build', 'outputs', 'bundle', 'release');
+    const unsignedBundle = join(bundleDirectory, 'app-release.aab');
+    const signedBundle = join(bundleDirectory, 'app-release-signed.aab');
+    if (!existsSync(keystorePath) || !existsSync(unsignedBundle)) {
+        throw new Error('The configured upload keystore or release AAB was not found.');
+    }
+
+    const jarsigner = process.env.JAVA_HOME
+        ? join(process.env.JAVA_HOME, 'bin', process.platform === 'win32' ? 'jarsigner.exe' : 'jarsigner')
+        : 'jarsigner';
+    try {
+        // Keep passwords out of command arguments and error output.
+        execFileSync(jarsigner, [
+            '-sigalg', 'SHA256withRSA', '-digestalg', 'SHA-256',
+            '-keystore', keystorePath,
+            '-storepass:env', 'CODEPLAY_AAB_STORE_PASSWORD',
+            '-keypass:env', 'CODEPLAY_AAB_KEY_PASSWORD',
+            '-signedjar', signedBundle, unsignedBundle, buildOptions.keystoreAlias,
+        ], {
+            stdio: 'pipe',
+            env: {
+                ...process.env,
+                CODEPLAY_AAB_STORE_PASSWORD: buildOptions.keystorePassword,
+                CODEPLAY_AAB_KEY_PASSWORD: buildOptions.keystoreAliasPassword,
+            },
+        });
+        const verification = execFileSync(jarsigner, [
+            '-J-Duser.language=en', '-J-Duser.country=US', '-verify', signedBundle,
+        ], { encoding: 'utf8', stdio: 'pipe' });
+        if (!verification.includes('jar verified.') || verification.includes('treated as unsigned')) {
+            throw new Error('Signature verification failed.');
+        }
+    } catch {
+        throw new Error('SHA-256 AAB signing or verification failed. Check the configured upload key and JDK; release stopped.');
+    }
+    console.log('✅ Release AAB signed with SHA-256 using the existing upload key and signature verified.');
+}
+
 const amazonWindowExtensionsDependency = 'implementation "androidx.window.extensions.core:core:1.0.0"';
 const amazonWindowExtensionsDependencyPattern = /^[ \t]*implementation\s+["']androidx\.window\.extensions\.core:core:[^"']+["'][ \t]*(?:\r?\n)?/gm;
 
@@ -828,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*/);
@@ -1013,11 +1102,14 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
 
                 execSync('npx cap sync android', { stdio: 'inherit' });
 
+                ensureReleaseCodeOptimization();
+
                 if (buildType === "APK") {
                     console.log("📦 Using custom Node signing script for APK build...");
                     execSync('node buildCodeplay/apk-store-builder.js', { stdio: 'inherit' });
                 } else {
                     execSync(`npx cap build android --androidreleasetype=${buildType}`, { stdio: 'inherit' });
+                    signReleaseBundleWithSha256();
                 }
 
 
@@ -1036,11 +1128,11 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
                 const checkFullPath = join("AAB", newFileName.replace(/\.aab$/, `.${newExt}`));
 
                 // Rename the output file
-                if (existsSync(oldFilePath)) {
-                    renameSync(oldFilePath, checkFullPath);
-                    console.log(`✅ Renamed output ${newExt.toUpperCase()} file to: ${path.basename(checkFullPath)}`);
-                    syncReleaseToCodeplay(storeName, finalVersionName, finalVersionCode, new Date().toISOString().slice(0, 10));
-                } else {
+                if (existsSync(oldFilePath)) {
+                    renameSync(oldFilePath, checkFullPath);
+                    console.log(`✅ Renamed output ${newExt.toUpperCase()} file to: ${path.basename(checkFullPath)}`);
+                    syncReleaseToCodeplay(storeName, finalVersionName, finalVersionCode, new Date().toISOString().slice(0, 10));
+                } else {
                     console.error(`❌ ${newExt.toUpperCase()} file not found after build.`);
                 }
 

package/package.json

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