codeplay-common 4.10.8 → 4.11.0

package/files/buildCodeplay/codeplayBeforeBuild.js

@@ -1,3 +1,4 @@
+// Version 6.8: preserve Capacitor permission annotations for Love Calculator Android builds.
 // Version 6.7: deferred IAP startup, ownership-safe ads, and unified store preparation.
 // Version 6.7: migrate AdMob files to ZIP-distributed folder packages.
 // Version 6.7: recreate failed WebViews, defer background recovery, and suppress foreground recovery toasts.
@@ -4521,8 +4522,30 @@ function findAndroidBuildBlock(content, name) {
   return null;
 }
 
+function syncAndroidCapacitorPermissionRules() {
+  if (buildPlatform !== 'android' || !fs.existsSync(androidAppBuildGradlePath)) return;
+  const capacitorConfig = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+  if (capacitorConfig.appId !== 'codeplay.love.calculator') return;
+
+  const rulesPath = path.join(androidPlatformPath, 'app', 'proguard-rules.pro');
+  const original = fs.existsSync(rulesPath) ? fs.readFileSync(rulesPath, 'utf8') : '';
+  const newline = original.includes('\r\n') ? '\r\n' : '\n';
+  const rules = [
+    '-keepattributes RuntimeVisibleAnnotations,AnnotationDefault',
+    '-keep @interface com.getcapacitor.annotation.CapacitorPlugin { *; }',
+    '-keep @interface com.getcapacitor.annotation.Permission { *; }'
+  ];
+  const existingRules = original.split(/\r?\n/).map(line => line.trim());
+  const missingRules = rules.filter(rule => !existingRules.includes(rule));
+  if (!missingRules.length) return;
+
+  const next = `${original.trimEnd()}${newline}${newline}# Preserve Capacitor permission metadata used at runtime.${newline}${missingRules.join(newline)}${newline}`;
+  fs.writeFileSync(rulesPath, next, 'utf8');
+}
+
 function syncAndroidBuildOptimization() {
   if (buildPlatform !== 'android' || !fs.existsSync(androidAppBuildGradlePath)) return;
+  syncAndroidCapacitorPermissionRules();
 
   const original = fs.readFileSync(androidAppBuildGradlePath, 'utf8');
   const newline = original.includes('\r\n') ? '\r\n' : '\n';

package/files/buildCodeplay/project-scripts.cjs

@@ -38,7 +38,9 @@ function updateBuildScripts(scripts) {
   next['ionic:build'] = next['ionic:build'] || 'npm run build';
   next['ionic:serve'] = next['ionic:serve'] || 'cross-env NODE_ENV=development vite';
   next['baseline-profile:setup'] = next['baseline-profile:setup'] || 'node scripts-common/setup-baseline-profile.js';
-  next['baseline-profile:generate'] = next['baseline-profile:generate'] || 'cd android && gradlew.bat :app:generateBaselineProfile --console=plain';
+  if (!next['baseline-profile:generate'] || next['baseline-profile:generate'] === 'cd android && gradlew.bat :app:generateBaselineProfile --console=plain') {
+    next['baseline-profile:generate'] = 'node scripts-common/generate-baseline-profile.js';
+  }
   next.release = next.release || 'node finalrelease';
   return next;
 }

package/files/scripts-common/generate-baseline-profile.js

@@ -0,0 +1,42 @@
+const { execFileSync, spawnSync } = require('child_process');
+const path = require('path');
+
+function main() {
+  const devices = execFileSync('adb', ['devices'], { encoding: 'utf8' })
+    .split(/\r?\n/)
+    .map(line => line.match(/^(.+?)\tdevice\s*$/))
+    .filter(Boolean)
+    .map(match => match[1]);
+  const requestedSerial = process.env.ANDROID_SERIAL?.trim();
+  if (requestedSerial?.includes(',')) {
+    throw new Error('Set ANDROID_SERIAL to one device connection for Baseline Profile generation.');
+  }
+  const serial = requestedSerial || devices[0];
+  if (!serial || !devices.includes(serial)) {
+    throw new Error(requestedSerial
+      ? `ADB device is not online: ${requestedSerial}`
+      : 'No online ADB device. Connect an Android device before generating a Baseline Profile.');
+  }
+
+  console.log(`Generating Baseline Profile using one ADB connection: ${serial}`);
+  const args = [':app:generateBaselineProfile', '--console=plain'];
+  const result = spawnSync(
+    process.platform === 'win32' ? 'cmd.exe' : './gradlew',
+    process.platform === 'win32' ? ['/d', '/s', '/c', `gradlew.bat ${args.join(' ')}`] : args,
+    {
+      cwd: path.resolve(__dirname, '..', 'android'),
+      env: { ...process.env, ANDROID_SERIAL: serial },
+      stdio: 'inherit',
+    }
+  );
+  if (result.error) throw result.error;
+  if (result.signal) throw new Error(`Baseline Profile generation stopped by ${result.signal}.`);
+  process.exitCode = result.status ?? 1;
+}
+
+try {
+  main();
+} catch (error) {
+  console.error(`Baseline Profile generation failed: ${error.message}`);
+  process.exitCode = 1;
+}

package/package.json

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