codeplay-common 4.11.3 → 4.11.4

package/CHANGELOG.md

@@ -1,77 +1,90 @@
 # Changelog
 
-## 4.10.5 — 2026-10-23
-
-Version name: 4.10.5. Version code/build number: not applicable to this npm package.
-
-Files changed: `package.json`, `scripts/sync-files.js`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
-
-- Migrate known legacy filename lookups in an existing app configurator after installing shared scripts.
-- Prefer unversioned pre-build and package-ID helpers while retaining the versioned fallback.
-- Correct the known old sync-hook folder assignment without replacing app-specific configuration or adding a configurator to apps that do not have one.
-
-## 4.10.4 — 2026-10-23
-
-Version name: 4.10.4. Version code/build number: not applicable to this npm package.
-
-Files changed: `package.json`, `files/scripts-common/run-codeplay-sync-after.js`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
-
-- Ship an updated sync-after hook for apps retaining the custom hook command after script migration.
-- Run unversioned splash helpers instead of searching for removed versioned filenames.
-- Resolve baseline profile setup from `scripts-common/` and preserve the existing native splash when no splash icon is configured.
-
-## 4.10.3 — 2026-10-23
-
-Version name: 4.10.3. Version code/build number: not applicable to this npm package.
-
-Files changed: `package.json`, `files/finalrelease`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
-
-- Allow ad-free apps with `plugins.AdMob.ADMOB_ENABLED: false` to pass release validation without an AdMob alias or controller.
-- Continue requiring a production AdMob alias when advertising is enabled or the enabled flag is unspecified.
-- Preserve rejection of test aliases, commented or duplicate aliases, and missing production controllers for apps with ads enabled.
-
-## 4.10.0 — 2026-10-23
-
-Version name: 4.10.0. Version code/build number: not applicable to this npm package.
-Bundled pre-build script: 6.7.
-
-Files changed: `package.json`, `files/buildCodeplay/project-scripts.cjs`, `scripts/sync-files.js`, `scripts/uninstall.js`, `files/finalrelease`, `files/buildCodeplay/`, `files/scripts-common/`, `files/take-screen-image.js`, `README.md`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
-
-- Copy shared build scripts and the versions manifest into each app; run local scripts with unversioned filenames.
-- Rename app helper scripts to scripts-common automatically, migrate command paths, and preserve existing files without overwriting folder conflicts.
-- Migrate app build/store/sync paths automatically and remove only superseded versioned helpers; preserve app-owned configuration and screenshot data.
-- Resolve app sources/native targets from the consuming app directory while keeping bundled assets inside the plugin.
-- Download IAP and AdMob directly from htmlcodeplay.com, without bundling archives or adding a separate fallback.
-- Automatically migrate deferred ownership verification, purchase-safe advertising, and Home Pro visibility according to each store IAP flag.
-- Copy the full finalrelease implementation so it can be tested from the application folder.
-- Preserve working files during preinstall and avoid downgrading local/newer plugin installations to an older registry release.
-
-## 4.9.8 — 2026-10-22
-
-Version name: 4.9.8. Version code/build number: not applicable to this npm package.
-Bundled pre-build script: 6.5.
-
-Files changed: `package.json`, `scripts/sync-files.js`, `files/buildCodeplay/codeplayBeforeBuild-6.5.js`, `files/buildCodeplay/sync-admob-nextgen.js`, `files/buildCodeplay/versions.json`, `files/finalrelease`, `README.md`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
-
-- Install AdMob as `src/js/Ads/admob-nextgen-4.0/` with stable `admob-emi-nextgen.js` and `app-open-state.js` filenames.
-- Automatically migrate loose-file references, folder references and Vite aliases during installation and before builds.
-- Preserve app-owned ad configuration and select each app's existing IAP analytics module.
-- Download every AdMob folder ZIP from htmlcodeplay.com; no AdMob archive is included in this npm package.
-- Validate ZIP contents before switching imports; retain the working package when a remote update fails.
-- Validate the selected folder controller during final-release checks while continuing to reject test aliases.
-
-## 4.7.7 — 2026-10-07
-
-Version name: 4.7.7. Version code/build number: not applicable to this npm package.
-Bundled pre-build script: 6.4.
-
-Files changed: `package.json`, `scripts/sync-files.js`, `files/buildCodeplay/codeplayBeforeBuild-6.4.js`
-(replaces `codeplayBeforeBuild-6.3.js`), `README.md`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
-
-- Keep `npm run build` as the Android default on every host; add `npm run build:ios` automatically during installation.
-- Route `build-capacitor-android` through the same pre-build validation before copying the web build.
-- Migrate direct save-gallery imports to `@saveGallery` and select the matching platform helper in Vite after one detailed Enter/y confirmation.
-- Stop without import writes on cancellation, missing helpers, mixed versions, unsupported query/hash aliases or concurrent source edits.
-- Reuse source directory traversal and combine gallery, retired OneSignal import, StatusBar and editor checks in one content pass.
-- Automatically remove an installed/declared `onesignal-cordova-plugin` with a warning; skip legacy OneSignal patching/helper downloads and stop on remaining package imports.
-- Keep `agent-temp/` ignored and remove existing `buildCodeplay/` ignore entries without adding them in future projects.
+## 4.11.4 — 2026-10-27
+
+Version name: 4.11.4. Version code/build number: not applicable to this npm package.
+
+Files changed: `package.json`, `scripts/sync-files.js`, `files/buildCodeplay/fix-optimize-builld/android-r8-rules.cjs`, `files/buildCodeplay/fix-optimize-builld/ffmpeg-jni-rules.cjs`, `files/buildCodeplay/fix-optimize-builld/restore-android-r8-rules.cjs`, `files/buildCodeplay/fix-optimize-builld/fix-optimize-build.gradle`, `files/buildCodeplay/codeplayBeforeBuild.js`, `files/buildCodeplay/manifestModification.js`, `files/buildCodeplay/project-scripts.cjs`, `files/finalrelease`, `README.md`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
+
+- Preserve Capacitor permission annotations in every consuming Android app, without an app ID or permission-use restriction.
+- Restore the scoped ProGuard rules during installation, Android sync and every Gradle build through a regenerated apply-from hook; keep existing custom rules and avoid duplicates.
+- Ship the helper inside `buildCodeplay` so shared templates do not depend on an app-specific `Scripts` file.
+- Provide `npm run android:r8-rules` and migrate the known previous helper command while preserving custom commands.
+- Keep permission declarations, prompts, minification settings and iOS configuration unchanged; already-distributed binaries require rebuilding.
+- Preserve explicit release minification settings when distributing shared templates, and retain the tested FFmpeg JNI rules when that plugin is installed.
+
+## 4.10.5 — 2026-10-23
+
+Version name: 4.10.5. Version code/build number: not applicable to this npm package.
+
+Files changed: `package.json`, `scripts/sync-files.js`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
+
+- Migrate known legacy filename lookups in an existing app configurator after installing shared scripts.
+- Prefer unversioned pre-build and package-ID helpers while retaining the versioned fallback.
+- Correct the known old sync-hook folder assignment without replacing app-specific configuration or adding a configurator to apps that do not have one.
+
+## 4.10.4 — 2026-10-23
+
+Version name: 4.10.4. Version code/build number: not applicable to this npm package.
+
+Files changed: `package.json`, `files/scripts-common/run-codeplay-sync-after.js`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
+
+- Ship an updated sync-after hook for apps retaining the custom hook command after script migration.
+- Run unversioned splash helpers instead of searching for removed versioned filenames.
+- Resolve baseline profile setup from `scripts-common/` and preserve the existing native splash when no splash icon is configured.
+
+## 4.10.3 — 2026-10-23
+
+Version name: 4.10.3. Version code/build number: not applicable to this npm package.
+
+Files changed: `package.json`, `files/finalrelease`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
+
+- Allow ad-free apps with `plugins.AdMob.ADMOB_ENABLED: false` to pass release validation without an AdMob alias or controller.
+- Continue requiring a production AdMob alias when advertising is enabled or the enabled flag is unspecified.
+- Preserve rejection of test aliases, commented or duplicate aliases, and missing production controllers for apps with ads enabled.
+
+## 4.10.0 — 2026-10-23
+
+Version name: 4.10.0. Version code/build number: not applicable to this npm package.
+Bundled pre-build script: 6.7.
+
+Files changed: `package.json`, `files/buildCodeplay/project-scripts.cjs`, `scripts/sync-files.js`, `scripts/uninstall.js`, `files/finalrelease`, `files/buildCodeplay/`, `files/scripts-common/`, `files/take-screen-image.js`, `README.md`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
+
+- Copy shared build scripts and the versions manifest into each app; run local scripts with unversioned filenames.
+- Rename app helper scripts to scripts-common automatically, migrate command paths, and preserve existing files without overwriting folder conflicts.
+- Migrate app build/store/sync paths automatically and remove only superseded versioned helpers; preserve app-owned configuration and screenshot data.
+- Resolve app sources/native targets from the consuming app directory while keeping bundled assets inside the plugin.
+- Download IAP and AdMob directly from htmlcodeplay.com, without bundling archives or adding a separate fallback.
+- Automatically migrate deferred ownership verification, purchase-safe advertising, and Home Pro visibility according to each store IAP flag.
+- Copy the full finalrelease implementation so it can be tested from the application folder.
+- Preserve working files during preinstall and avoid downgrading local/newer plugin installations to an older registry release.
+
+## 4.9.8 — 2026-10-22
+
+Version name: 4.9.8. Version code/build number: not applicable to this npm package.
+Bundled pre-build script: 6.5.
+
+Files changed: `package.json`, `scripts/sync-files.js`, `files/buildCodeplay/codeplayBeforeBuild-6.5.js`, `files/buildCodeplay/sync-admob-nextgen.js`, `files/buildCodeplay/versions.json`, `files/finalrelease`, `README.md`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
+
+- Install AdMob as `src/js/Ads/admob-nextgen-4.0/` with stable `admob-emi-nextgen.js` and `app-open-state.js` filenames.
+- Automatically migrate loose-file references, folder references and Vite aliases during installation and before builds.
+- Preserve app-owned ad configuration and select each app's existing IAP analytics module.
+- Download every AdMob folder ZIP from htmlcodeplay.com; no AdMob archive is included in this npm package.
+- Validate ZIP contents before switching imports; retain the working package when a remote update fails.
+- Validate the selected folder controller during final-release checks while continuing to reject test aliases.
+
+## 4.7.7 — 2026-10-07
+
+Version name: 4.7.7. Version code/build number: not applicable to this npm package.
+Bundled pre-build script: 6.4.
+
+Files changed: `package.json`, `scripts/sync-files.js`, `files/buildCodeplay/codeplayBeforeBuild-6.4.js`
+(replaces `codeplayBeforeBuild-6.3.js`), `README.md`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
+
+- Keep `npm run build` as the Android default on every host; add `npm run build:ios` automatically during installation.
+- Route `build-capacitor-android` through the same pre-build validation before copying the web build.
+- Migrate direct save-gallery imports to `@saveGallery` and select the matching platform helper in Vite after one detailed Enter/y confirmation.
+- Stop without import writes on cancellation, missing helpers, mixed versions, unsupported query/hash aliases or concurrent source edits.
+- Reuse source directory traversal and combine gallery, retired OneSignal import, StatusBar and editor checks in one content pass.
+- Automatically remove an installed/declared `onesignal-cordova-plugin` with a warning; skip legacy OneSignal patching/helper downloads and stop on remaining package imports.
+- Keep `agent-temp/` ignored and remove existing `buildCodeplay/` ignore entries without adding them in future projects.

package/README.md

@@ -9,6 +9,16 @@ Based on store install various IAP plugins
 Make it to ionic project
 
 
+## Capacitor Android permission metadata (4.11.4)
+
+The package preserves the runtime `CapacitorPlugin` and `Permission` annotation members required by optimized Android builds. This applies to every Android consumer, even if the app does not currently use permission-dependent plugins. It does not declare or grant permissions, show prompts, or enable minification.
+
+Installation applies the rules to an existing Android project and installs one `apply from` line in `android/app/build.gradle`. The included Gradle script reruns the repair during every Gradle configuration, including direct Android Studio/Gradle and Capacitor `run --no-sync` builds. All repair logic stays in the shared fix folder. Android sync, build preparation and release preparation restore missing rules after platform regeneration. The generated Gradle hook is restored after platform regeneration. Existing custom ProGuard rules are preserved and repeated runs do not add duplicates. Apps without an Android platform are skipped until that platform exists.
+
+All fix implementations ship under `buildCodeplay/fix-optimize-builld/`, including the restore command and its Gradle integration; no app-specific `Scripts` file is required. Run `npm run android:r8-rules` to restore the rules manually. Existing custom npm commands are preserved; the known older `restore-android-r8-rules.cjs` command is migrated automatically.
+
+After installing this package update, rebuild and test each app's optimized release. Updating build tooling cannot change APKs or app-store releases already distributed to users.
+
 ## App helper folder
 
 Application helper scripts are kept in `scripts-common/`. Installation migrates the old `scripts/` folder and package command paths automatically, preserving every existing file. A conflicting destination file stops migration before any files are moved. The plugin’s internal npm lifecycle folder remains `scripts/`.
@@ -213,3 +223,5 @@ Version : 4.0.0 (Previous version 3.2.19)
     1) In here we are completly remove the admob-emi and use "capacitor-admob-nextgen"
     2) Removed "modify-plugin-xml.js"
     3) 
+
+The fix preserves the metadata behind the release permission-check failure verified in testing. It does not guarantee every native dialog or plugin: required manifest declarations, Android permission policy, device settings and plugin-specific keep rules still apply.

package/RELEASE_NOTES.md

@@ -1,75 +1,88 @@
 # Release notes
 
-## 4.10.5 — 2026-10-23
-
-Version name: 4.10.5. Version code/build number: not applicable to this npm package.
-
-Files changed: `package.json`, `scripts/sync-files.js`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
-
-- Prevent app postinstall failures after shared scripts switch to unversioned filenames.
-- Repair the known old sync-hook path during plugin installation.
-- Preserve each app's custom configuration and leave apps without the affected configurator unchanged.
-
-## 4.10.4 — 2026-10-23
-
-Version name: 4.10.4. Version code/build number: not applicable to this npm package.
-
-Files changed: `package.json`, `files/scripts-common/run-codeplay-sync-after.js`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
-
-- Fix Android sync failures caused by the old versioned splash script lookup.
-- Use the migrated baseline profile setup path.
-- Update the custom sync hook automatically during plugin installation.
-
-## 4.10.3 — 2026-10-23
-
-Version name: 4.10.3. Version code/build number: not applicable to this npm package.
-
-Files changed: `package.json`, `files/finalrelease`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
-
-- Release ad-free apps without adding an unnecessary AdMob alias or controller.
-- Explicitly set `plugins.AdMob.ADMOB_ENABLED` to `false` to use the ad-free release path.
-- Keep production AdMob safety checks for apps with advertising enabled.
-
-## 4.10.0 — 2026-10-23
-
-Version name: 4.10.0. Version code/build number: not applicable to this npm package.
-Bundled pre-build script: 6.7.
-
-Files changed: `package.json`, `files/buildCodeplay/project-scripts.cjs`, `scripts/sync-files.js`, `scripts/uninstall.js`, `files/finalrelease`, `files/buildCodeplay/`, `files/scripts-common/`, `files/take-screen-image.js`, `README.md`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
-
-- Copy shared build scripts and the versions manifest into each app; run local scripts with unversioned filenames.
-- Rename app helper scripts to scripts-common automatically, migrate command paths, and preserve existing files without overwriting folder conflicts.
-- Migrate app build/store/sync paths automatically and remove only superseded versioned helpers; preserve app-owned configuration and screenshot data.
-- Resolve app sources/native targets from the consuming app directory while keeping bundled assets inside the plugin.
-- Download IAP and AdMob directly from htmlcodeplay.com, without bundling archives or adding a separate fallback.
-- Automatically migrate deferred ownership verification, purchase-safe advertising, and Home Pro visibility according to each store IAP flag.
-- Copy the full finalrelease implementation so it can be tested from the application folder.
-- Preserve working files during preinstall and avoid downgrading local/newer plugin installations to an older registry release.
-
-## 4.9.8 — 2026-10-22
-
-Version name: 4.9.8. Version code/build number: not applicable to this npm package.
-Bundled pre-build script: 6.5.
-
-Files changed: `package.json`, `scripts/sync-files.js`, `files/buildCodeplay/codeplayBeforeBuild-6.5.js`, `files/buildCodeplay/sync-admob-nextgen.js`, `files/buildCodeplay/versions.json`, `files/finalrelease`, `README.md`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
-
-- Install AdMob as `src/js/Ads/admob-nextgen-4.0/` with stable `admob-emi-nextgen.js` and `app-open-state.js` filenames.
-- Automatically migrate loose-file references, folder references and Vite aliases during installation and before builds.
-- Preserve app-owned ad configuration and select each app's existing IAP analytics module.
-- Download every AdMob folder ZIP from htmlcodeplay.com; no AdMob archive is included in this npm package.
-- Validate ZIP contents before switching imports; retain the working package when a remote update fails.
-- Validate the selected folder controller during final-release checks while continuing to reject test aliases.
-
-## 4.7.7 — 2026-10-07
-
-Version name: 4.7.7. Version code/build number: not applicable to this npm package.
-
-Files changed: `package.json`, `scripts/sync-files.js`, `files/buildCodeplay/codeplayBeforeBuild-6.4.js`
-(replaces `codeplayBeforeBuild-6.3.js`), `README.md`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
-
-- Installation automatically configures Android and iOS build commands in your app's `package.json`.
-- Android builds remain the default; use `npm run build:ios` for iOS.
-- Save-gallery imports use one alias with a platform-specific helper and a clear confirmation before source changes.
-- Shared checks reuse file traversal to reduce repeated scanning.
-- Builds warn and automatically uninstall the retired OneSignal Cordova plugin when found.
-- `agent-temp/` stays ignored, while `buildCodeplay/` is removed from ignore rules.
+## 4.11.4 — 2026-10-27
+
+Version name: 4.11.4. Version code/build number: not applicable to this npm package.
+
+Files changed: `package.json`, `scripts/sync-files.js`, `files/buildCodeplay/fix-optimize-builld/android-r8-rules.cjs`, `files/buildCodeplay/fix-optimize-builld/ffmpeg-jni-rules.cjs`, `files/buildCodeplay/fix-optimize-builld/restore-android-r8-rules.cjs`, `files/buildCodeplay/fix-optimize-builld/fix-optimize-build.gradle`, `files/buildCodeplay/codeplayBeforeBuild.js`, `files/buildCodeplay/manifestModification.js`, `files/buildCodeplay/project-scripts.cjs`, `files/finalrelease`, `README.md`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
+
+- Fix missing permission-check results caused by release optimization removing Capacitor metadata.
+- Apply protection to all Android apps using this package, including apps with no permission-dependent features.
+- Restore protection after native platform regeneration and package updates, and check it on every Gradle build without overwriting custom ProGuard rules.
+- Keep the fix self-contained in the shared package and provide a manual restore command.
+- No new permissions or prompts are added. Update the package and rebuild each app to include the correction.
+- Preserve existing release minification choices and protect FFmpeg native entry points in apps using that plugin.
+
+## 4.10.5 — 2026-10-23
+
+Version name: 4.10.5. Version code/build number: not applicable to this npm package.
+
+Files changed: `package.json`, `scripts/sync-files.js`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
+
+- Prevent app postinstall failures after shared scripts switch to unversioned filenames.
+- Repair the known old sync-hook path during plugin installation.
+- Preserve each app's custom configuration and leave apps without the affected configurator unchanged.
+
+## 4.10.4 — 2026-10-23
+
+Version name: 4.10.4. Version code/build number: not applicable to this npm package.
+
+Files changed: `package.json`, `files/scripts-common/run-codeplay-sync-after.js`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
+
+- Fix Android sync failures caused by the old versioned splash script lookup.
+- Use the migrated baseline profile setup path.
+- Update the custom sync hook automatically during plugin installation.
+
+## 4.10.3 — 2026-10-23
+
+Version name: 4.10.3. Version code/build number: not applicable to this npm package.
+
+Files changed: `package.json`, `files/finalrelease`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
+
+- Release ad-free apps without adding an unnecessary AdMob alias or controller.
+- Explicitly set `plugins.AdMob.ADMOB_ENABLED` to `false` to use the ad-free release path.
+- Keep production AdMob safety checks for apps with advertising enabled.
+
+## 4.10.0 — 2026-10-23
+
+Version name: 4.10.0. Version code/build number: not applicable to this npm package.
+Bundled pre-build script: 6.7.
+
+Files changed: `package.json`, `files/buildCodeplay/project-scripts.cjs`, `scripts/sync-files.js`, `scripts/uninstall.js`, `files/finalrelease`, `files/buildCodeplay/`, `files/scripts-common/`, `files/take-screen-image.js`, `README.md`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
+
+- Copy shared build scripts and the versions manifest into each app; run local scripts with unversioned filenames.
+- Rename app helper scripts to scripts-common automatically, migrate command paths, and preserve existing files without overwriting folder conflicts.
+- Migrate app build/store/sync paths automatically and remove only superseded versioned helpers; preserve app-owned configuration and screenshot data.
+- Resolve app sources/native targets from the consuming app directory while keeping bundled assets inside the plugin.
+- Download IAP and AdMob directly from htmlcodeplay.com, without bundling archives or adding a separate fallback.
+- Automatically migrate deferred ownership verification, purchase-safe advertising, and Home Pro visibility according to each store IAP flag.
+- Copy the full finalrelease implementation so it can be tested from the application folder.
+- Preserve working files during preinstall and avoid downgrading local/newer plugin installations to an older registry release.
+
+## 4.9.8 — 2026-10-22
+
+Version name: 4.9.8. Version code/build number: not applicable to this npm package.
+Bundled pre-build script: 6.5.
+
+Files changed: `package.json`, `scripts/sync-files.js`, `files/buildCodeplay/codeplayBeforeBuild-6.5.js`, `files/buildCodeplay/sync-admob-nextgen.js`, `files/buildCodeplay/versions.json`, `files/finalrelease`, `README.md`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
+
+- Install AdMob as `src/js/Ads/admob-nextgen-4.0/` with stable `admob-emi-nextgen.js` and `app-open-state.js` filenames.
+- Automatically migrate loose-file references, folder references and Vite aliases during installation and before builds.
+- Preserve app-owned ad configuration and select each app's existing IAP analytics module.
+- Download every AdMob folder ZIP from htmlcodeplay.com; no AdMob archive is included in this npm package.
+- Validate ZIP contents before switching imports; retain the working package when a remote update fails.
+- Validate the selected folder controller during final-release checks while continuing to reject test aliases.
+
+## 4.7.7 — 2026-10-07
+
+Version name: 4.7.7. Version code/build number: not applicable to this npm package.
+
+Files changed: `package.json`, `scripts/sync-files.js`, `files/buildCodeplay/codeplayBeforeBuild-6.4.js`
+(replaces `codeplayBeforeBuild-6.3.js`), `README.md`, `CHANGELOG.md`, `RELEASE_NOTES.md`.
+
+- Installation automatically configures Android and iOS build commands in your app's `package.json`.
+- Android builds remain the default; use `npm run build:ios` for iOS.
+- Save-gallery imports use one alias with a platform-specific helper and a clear confirmation before source changes.
+- Shared checks reuse file traversal to reduce repeated scanning.
+- Builds warn and automatically uninstall the retired OneSignal Cordova plugin when found.
+- `agent-temp/` stays ignored, while `buildCodeplay/` is removed from ignore rules.

package/files/buildCodeplay/codeplayBeforeBuild.js

@@ -4522,30 +4522,9 @@ 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();
+  require('./fix-optimize-builld/restore-android-r8-rules.cjs').syncAndroidR8Rules(process.cwd(), { installGradleHook: true });
 
   const original = fs.readFileSync(androidAppBuildGradlePath, 'utf8');
   const newline = original.includes('\r\n') ? '\r\n' : '\n';

package/files/buildCodeplay/fix-optimize-builld/android-r8-rules.cjs

@@ -0,0 +1,31 @@
+const fs = require('fs');
+const path = require('path');
+
+function syncCapacitorPermissionRules(projectRoot = path.resolve(__dirname, '../..')) {
+  const appPath = path.join(projectRoot, 'android', 'app');
+  if (!fs.existsSync(path.join(appPath, 'build.gradle'))) return false;
+
+  const rulesPath = path.join(appPath, 'proguard-rules.pro');
+  const original = fs.existsSync(rulesPath) ? fs.readFileSync(rulesPath, 'utf8') : '';
+  const rules = [
+    '-keepattributes RuntimeVisibleAnnotations,AnnotationDefault',
+    '-keep @interface com.getcapacitor.annotation.CapacitorPlugin { *; }',
+    '-keep @interface com.getcapacitor.annotation.Permission { *; }',
+  ];
+  const existing = new Set(original.split(/\r?\n/).map(line => line.trim()));
+  const missing = rules.filter(rule => !existing.has(rule));
+  if (!missing.length) return false;
+
+  const newline = original.includes('\r\n') ? '\r\n' : '\n';
+  fs.writeFileSync(rulesPath, `${original.trimEnd()}${newline}${newline}`
+    + `# Preserve Capacitor permission metadata used at runtime.${newline}`
+    + `${missing.join(newline)}${newline}`, 'utf8');
+  return true;
+}
+
+if (require.main === module) {
+  const changed = syncCapacitorPermissionRules();
+  console.log(changed ? 'Capacitor R8 permission rules restored.' : 'Capacitor R8 permission rules unchanged.');
+}
+
+module.exports = { syncCapacitorPermissionRules };

package/files/buildCodeplay/fix-optimize-builld/ffmpeg-jni-rules.cjs

@@ -0,0 +1,28 @@
+const fs = require('fs');
+const path = require('path');
+
+// FFmpegKit's JNI library looks up these Java members by name at runtime.
+const FFMPEG_JNI_RULES = [
+  '-keep class com.antonkarpenko.ffmpegkit.** { *; }',
+  '-keep interface com.antonkarpenko.ffmpegkit.** { *; }',
+];
+
+function syncFfmpegJniRules(projectRoot) {
+  const pluginPath = path.join(projectRoot, 'node_modules', 'codeplay-fmpg', 'plugin.xml');
+  const appPath = path.join(projectRoot, 'android', 'app');
+  if (!fs.existsSync(pluginPath) || !fs.existsSync(appPath)) return false;
+
+  const rulesPath = path.join(appPath, 'proguard-rules.pro');
+  const original = fs.existsSync(rulesPath) ? fs.readFileSync(rulesPath, 'utf8') : '';
+  const existing = new Set(original.split(/\r?\n/).map(line => line.trim()));
+  const missing = FFMPEG_JNI_RULES.filter(rule => !existing.has(rule));
+  if (!missing.length) return false;
+
+  const newline = original.includes('\r\n') ? '\r\n' : '\n';
+  fs.writeFileSync(rulesPath, `${original.trimEnd()}${newline}${newline}`
+    + `# Preserve FFmpegKit JNI entry points and callbacks.${newline}`
+    + `${missing.join(newline)}${newline}`, 'utf8');
+  return true;
+}
+
+module.exports = { syncFfmpegJniRules };

package/files/buildCodeplay/fix-optimize-builld/fix-optimize-build.gradle

@@ -0,0 +1,9 @@
+// Restore native metadata before Gradle configures an optimized Android build.
+def codeplayAppRoot = rootProject.projectDir.parentFile
+def codeplayRepairScript = new File(codeplayAppRoot, 'buildCodeplay/fix-optimize-builld/restore-android-r8-rules.cjs')
+def codeplayNodeBinary = project.findProperty('codeplayNodeBinary') ?: 'node'
+
+providers.exec {
+    workingDir codeplayAppRoot
+    commandLine codeplayNodeBinary, codeplayRepairScript.absolutePath
+}.result.get().assertNormalExitValue()

package/files/buildCodeplay/fix-optimize-builld/restore-android-r8-rules.cjs

@@ -0,0 +1,30 @@
+const fs = require('fs');
+const path = require('path');
+const { syncFfmpegJniRules } = require('./ffmpeg-jni-rules.cjs');
+const { syncCapacitorPermissionRules } = require('./android-r8-rules.cjs');
+
+function syncAndroidR8Rules(projectRoot = path.resolve(__dirname, '../..'), { installGradleHook = false } = {}) {
+  const buildPath = path.join(projectRoot, 'android', 'app', 'build.gradle');
+  if (!fs.existsSync(buildPath)) return false;
+  const capacitorChanged = syncCapacitorPermissionRules(projectRoot);
+  const ffmpegChanged = syncFfmpegJniRules(projectRoot);
+  let hookChanged = false;
+  if (installGradleHook) {
+    const original = fs.readFileSync(buildPath, 'utf8');
+    const hook = "apply from: '../../buildCodeplay/fix-optimize-builld/fix-optimize-build.gradle'";
+    const existingHook = /^[ \t]*apply\s+from:\s*(['"])\.\.\/\.\.\/buildCodeplay\/fix-optimize-builld\/fix-optimize-build\.gradle\1[ \t]*;?[ \t]*$/m;
+    if (!existingHook.test(original)) {
+      const newline = original.includes('\r\n') ? '\r\n' : '\n';
+      fs.writeFileSync(buildPath, `${original.trimEnd()}${newline}${newline}${hook}${newline}`, 'utf8');
+      hookChanged = true;
+    }
+  }
+  return capacitorChanged || ffmpegChanged || hookChanged;
+}
+
+if (require.main === module) {
+  const changed = syncAndroidR8Rules(undefined, { installGradleHook: process.argv.includes('--install-gradle-hook') });
+  console.log(changed ? 'Android R8 keep rules restored.' : 'Android R8 keep rules unchanged; no Android app or rules already present.');
+}
+
+module.exports = { syncAndroidR8Rules };

package/files/buildCodeplay/ios-emi-admob-modification.js

@@ -1,14 +1,14 @@
-const fs = require('fs');
-const path = require('path');
-
-const replaceEmiPluginCode=()=>
-{
-  // path to your .m file
-  const filePath = path.join(__dirname, '../ios/capacitor-cordova-ios-plugins/sourcesstatic/EmiIndoCordovaPluginAdmob/emiAdmobPlugin.m');
-  const nextGenPackagePath = path.join(__dirname, '../node_modules/capacitor-admob-nextgen/package.json');
-
-
-  if (fs.existsSync(filePath)) {
+const fs = require('fs');
+const path = require('path');
+
+const replaceEmiPluginCode=()=>
+{
+  // path to your .m file
+  const filePath = path.join(__dirname, '../ios/capacitor-cordova-ios-plugins/sourcesstatic/EmiIndoCordovaPluginAdmob/emiAdmobPlugin.m');
+  const nextGenPackagePath = path.join(__dirname, '../node_modules/capacitor-admob-nextgen/package.json');
+
+
+  if (fs.existsSync(filePath)) {
     let fileContent = fs.readFileSync(filePath, 'utf8');
 
     // match the hideBannerAd method
@@ -33,17 +33,17 @@ const replaceEmiPluginCode=()=>
         fileContent.slice(match.index + match[0].length);
 
       fs.writeFileSync(filePath, updatedFileContent, 'utf8');
-      console.log(
-        '✅ Successfully ensured [self resetWebViewHeight]; is commented only inside hideBannerAd in emiAdmobPlugin.m'
-      );
-    } else {
-      console.log('⚠️ hideBannerAd method not found.');
-    }
-  } else if (fs.existsSync(nextGenPackagePath)) {
-    console.log('ℹ️  Skipping legacy iOS EMI AdMob patch. capacitor-admob-nextgen does not use emiAdmobPlugin.m.');
-  } else {
-    console.log('ℹ️  emiAdmobPlugin.m file not found, skipping modification.');
-  }
-}
-
-replaceEmiPluginCode();
+      console.log(
+        '✅ Successfully ensured [self resetWebViewHeight]; is commented only inside hideBannerAd in emiAdmobPlugin.m'
+      );
+    } else {
+      console.log('⚠️ hideBannerAd method not found.');
+    }
+  } else if (fs.existsSync(nextGenPackagePath)) {
+    console.log('ℹ️  Skipping legacy iOS EMI AdMob patch. capacitor-admob-nextgen does not use emiAdmobPlugin.m.');
+  } else {
+    console.log('ℹ️  emiAdmobPlugin.m file not found, skipping modification.');
+  }
+}
+
+replaceEmiPluginCode();

package/files/buildCodeplay/manifestModification.js

@@ -1,6 +1,9 @@
 const fs = require('fs');
 const path = require('path');
 const plist = require('plist');
+const { syncAndroidR8Rules } = require('./fix-optimize-builld/restore-android-r8-rules.cjs');
+
+syncAndroidR8Rules(process.cwd(), { installGradleHook: true });
 
 const { readFileSync } = require("fs");
 

package/files/buildCodeplay/newly added.txt

@@ -1,90 +1,90 @@
-Note: This changes are added with my old(current) code. Might we need to integrate this features into our new optimized code.
-
-1) If no import(saveToGalleryAndSaveAnyFile) found it through error issue is fixed
-    // iOS Checks
-    /*   if (isMac && !iosImportFound) {
-        console.warn(`⚠️ WARNING: You're on macOS but no iOS version (saveToGalleryAndSaveAnyFile-x.x-ios.js) found.`);
-        process.exit(1);
-    } else if (isMac && iosImportFound) {
-        console.log('✅ iOS version detected for macOS build.');
-    } else if (!iosImportFound) {
-        console.log('✅ No iOS-specific imports detected for non-macOS.');
-    } */
-
-    // ✅ Only care if iOS import is found in NON-mac systems
-    if (iosImportFound && !isMac) {
-    console.error(`\n❌ ERROR: iOS-specific file is imported in non-macOS environment.`);
-    process.exit(1);
-    } else if (iosImportFound && isMac) {
-    console.log('✅ iOS import detected (valid for macOS build).');
-    } else {
-    console.log('✅ No iOS-specific imports found (this is totally fine).');
-    }
-
-
-2) Statusbar color set in app startup is checked and through erro
-
-    const STATUSBAR_FILE = path.resolve(__dirname, '../src/js/common-configuration.js');
-    const STATUSBAR_REGEX = /^(?!\s*\/\/).*Capacitor\.Plugins\.StatusBar\.setStyle/m;
-
-
-    const ONESIGNAL_OLD_FILES = [
-    path.resolve(__dirname, '../src/js/onesignal-settings.js')
-    ];
-    const ONESIGNAL_VERSION_REGEX = /^onesignal-\d+(\.\d+)*\.js$/;
-    
-    ....
-    ....
-    ....
-
-
-    const JS_ROOT = path.resolve(__dirname, '../src/js');
-    const ONESIGNAL_DIR = path.join(JS_ROOT, 'onesignal');
-
-    // 🚨 Block old OneSignal file locations (ONLY in src/js root)
-    if (path.dirname(dir) === JS_ROOT) {
-
-      // ❌ onesignal-settings.js
-      if (ONESIGNAL_OLD_FILES.includes(dir)) {
-        console.error(`\n❌ ERROR: onesignal-settings.js should not be in src/js/`);
-        console.error(`📁 Move it to: src/js/onesignal/`);
-        console.error(`📄 File: ${dir}\n`);
-        process.exit(1);
-      }
-
-      // ❌ onesignal-x.x.js
-      if (ONESIGNAL_VERSION_REGEX.test(baseName)) {
-        console.error(`\n❌ ERROR: ${baseName} should not be in src/js/`);
-        console.error(`📁 Move it to: src/js/onesignal/`);
-        console.error(`📄 File: ${dir}\n`);
-        process.exit(1);
-      }
-    } 
-
-    // 🚨 Special check ONLY for common-configuration.js
-    if (dir === STATUSBAR_FILE) {
-      let content = fs.readFileSync(dir, 'utf8');
-
-      // 🧹 Remove ALL comments (single-line + multi-line)
-      const contentWithoutComments = content
-        .replace(/\/\/.*$/gm, '')          // remove // comments
-        .replace(/\/\*[\s\S]*?\*\//g, ''); // remove /* */ comments
-
-      // ✅ Now check only real code
-      if (contentWithoutComments.includes('Capacitor.Plugins.StatusBar.setStyle')) {
-        console.error(`\n❌ ERROR: StatusBar.setStyle should NOT be used in common-configuration.js`);
-        console.error(`🚫 iOS status bar is controlled via other methods. Remove this line.`);
-        console.error(`📄 File: ${dir}\n`);
-        process.exit(1);
-      }
-    }
-
-
-3) Modification in "fix-onesignal-plugin.js" file
-  Search following and that whole block added for add permission to "info.plist" file
-    INFO.PLIST START
-
-4) In "codeplayBeforeBuild-6.1.js" file following whole method is replaced. Due to add ads related permission to info.plist file
-    updateInfoPlist()
-
+Note: This changes are added with my old(current) code. Might we need to integrate this features into our new optimized code.
+
+1) If no import(saveToGalleryAndSaveAnyFile) found it through error issue is fixed
+    // iOS Checks
+    /*   if (isMac && !iosImportFound) {
+        console.warn(`⚠️ WARNING: You're on macOS but no iOS version (saveToGalleryAndSaveAnyFile-x.x-ios.js) found.`);
+        process.exit(1);
+    } else if (isMac && iosImportFound) {
+        console.log('✅ iOS version detected for macOS build.');
+    } else if (!iosImportFound) {
+        console.log('✅ No iOS-specific imports detected for non-macOS.');
+    } */
+
+    // ✅ Only care if iOS import is found in NON-mac systems
+    if (iosImportFound && !isMac) {
+    console.error(`\n❌ ERROR: iOS-specific file is imported in non-macOS environment.`);
+    process.exit(1);
+    } else if (iosImportFound && isMac) {
+    console.log('✅ iOS import detected (valid for macOS build).');
+    } else {
+    console.log('✅ No iOS-specific imports found (this is totally fine).');
+    }
+
+
+2) Statusbar color set in app startup is checked and through erro
+
+    const STATUSBAR_FILE = path.resolve(__dirname, '../src/js/common-configuration.js');
+    const STATUSBAR_REGEX = /^(?!\s*\/\/).*Capacitor\.Plugins\.StatusBar\.setStyle/m;
+
+
+    const ONESIGNAL_OLD_FILES = [
+    path.resolve(__dirname, '../src/js/onesignal-settings.js')
+    ];
+    const ONESIGNAL_VERSION_REGEX = /^onesignal-\d+(\.\d+)*\.js$/;
+    
+    ....
+    ....
+    ....
+
+
+    const JS_ROOT = path.resolve(__dirname, '../src/js');
+    const ONESIGNAL_DIR = path.join(JS_ROOT, 'onesignal');
+
+    // 🚨 Block old OneSignal file locations (ONLY in src/js root)
+    if (path.dirname(dir) === JS_ROOT) {
+
+      // ❌ onesignal-settings.js
+      if (ONESIGNAL_OLD_FILES.includes(dir)) {
+        console.error(`\n❌ ERROR: onesignal-settings.js should not be in src/js/`);
+        console.error(`📁 Move it to: src/js/onesignal/`);
+        console.error(`📄 File: ${dir}\n`);
+        process.exit(1);
+      }
+
+      // ❌ onesignal-x.x.js
+      if (ONESIGNAL_VERSION_REGEX.test(baseName)) {
+        console.error(`\n❌ ERROR: ${baseName} should not be in src/js/`);
+        console.error(`📁 Move it to: src/js/onesignal/`);
+        console.error(`📄 File: ${dir}\n`);
+        process.exit(1);
+      }
+    } 
+
+    // 🚨 Special check ONLY for common-configuration.js
+    if (dir === STATUSBAR_FILE) {
+      let content = fs.readFileSync(dir, 'utf8');
+
+      // 🧹 Remove ALL comments (single-line + multi-line)
+      const contentWithoutComments = content
+        .replace(/\/\/.*$/gm, '')          // remove // comments
+        .replace(/\/\*[\s\S]*?\*\//g, ''); // remove /* */ comments
+
+      // ✅ Now check only real code
+      if (contentWithoutComments.includes('Capacitor.Plugins.StatusBar.setStyle')) {
+        console.error(`\n❌ ERROR: StatusBar.setStyle should NOT be used in common-configuration.js`);
+        console.error(`🚫 iOS status bar is controlled via other methods. Remove this line.`);
+        console.error(`📄 File: ${dir}\n`);
+        process.exit(1);
+      }
+    }
+
+
+3) Modification in "fix-onesignal-plugin.js" file
+  Search following and that whole block added for add permission to "info.plist" file
+    INFO.PLIST START
+
+4) In "codeplayBeforeBuild-6.1.js" file following whole method is replaced. Due to add ads related permission to info.plist file
+    updateInfoPlist()
+
 5) The "checkPackageVersion()" metod is updated. Now check the "codeplay-common" latest version and uninstall/install automatically.

package/files/buildCodeplay/project-scripts.cjs

@@ -38,6 +38,10 @@ 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';
+  const r8Command = next['android:r8-rules'];
+  if (!r8Command || r8Command === 'node buildCodeplay/android-r8-rules.cjs' || /^node\s+(?:\.\/)?(?:Scripts|scripts|scripts-common)\/restore-android-r8-rules\.cjs$/.test(r8Command)) {
+    next['android:r8-rules'] = 'node buildCodeplay/fix-optimize-builld/restore-android-r8-rules.cjs';
+  }
   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';
   }

package/files/buildCodeplay/remove-force-kotlin-disable.js

@@ -1,43 +1,43 @@
-const fs = require('fs');
-const path = require('path');
-
-const legacyPluginXmlPath = path.resolve(
-  __dirname,
-  '../node_modules/emi-indo-cordova-plugin-admob/plugin.xml'
-);
-
-const nextGenPackagePath = path.resolve(
-  __dirname,
-  '../node_modules/capacitor-admob-nextgen/package.json'
-);
-
-if (!fs.existsSync(legacyPluginXmlPath)) {
-  if (fs.existsSync(nextGenPackagePath)) {
-    console.log('ℹ️  Skipping legacy Kotlin patch. capacitor-admob-nextgen is installed and does not use plugin.xml.');
-    process.exit(0);
-  }
-
-  console.log('ℹ️  Legacy AdMob plugin.xml not found, skipping Kotlin patch.');
-  process.exit(0);
-}
-
-fs.readFile(legacyPluginXmlPath, 'utf8', (err, data) => {
-  if (err) {
-    console.error('Error reading plugin.xml:', err);
-    process.exit(1);
-  }
-
-  const modifiedData = data.replace(
-    /<framework\s+src="src\/android\/force-kotlin\.gradle"\s+custom="true"\s+type="gradleReference"\s*\/>\s*\n?/g,
-    ''
-  );
-
-  fs.writeFile(legacyPluginXmlPath, modifiedData, 'utf8', (writeErr) => {
-    if (writeErr) {
-      console.error('Error writing plugin.xml:', writeErr);
-      process.exit(1);
-    }
-
-    console.log('plugin.xml updated successfully.');
-  });
-});
+const fs = require('fs');
+const path = require('path');
+
+const legacyPluginXmlPath = path.resolve(
+  __dirname,
+  '../node_modules/emi-indo-cordova-plugin-admob/plugin.xml'
+);
+
+const nextGenPackagePath = path.resolve(
+  __dirname,
+  '../node_modules/capacitor-admob-nextgen/package.json'
+);
+
+if (!fs.existsSync(legacyPluginXmlPath)) {
+  if (fs.existsSync(nextGenPackagePath)) {
+    console.log('ℹ️  Skipping legacy Kotlin patch. capacitor-admob-nextgen is installed and does not use plugin.xml.');
+    process.exit(0);
+  }
+
+  console.log('ℹ️  Legacy AdMob plugin.xml not found, skipping Kotlin patch.');
+  process.exit(0);
+}
+
+fs.readFile(legacyPluginXmlPath, 'utf8', (err, data) => {
+  if (err) {
+    console.error('Error reading plugin.xml:', err);
+    process.exit(1);
+  }
+
+  const modifiedData = data.replace(
+    /<framework\s+src="src\/android\/force-kotlin\.gradle"\s+custom="true"\s+type="gradleReference"\s*\/>\s*\n?/g,
+    ''
+  );
+
+  fs.writeFile(legacyPluginXmlPath, modifiedData, 'utf8', (writeErr) => {
+    if (writeErr) {
+      console.error('Error writing plugin.xml:', writeErr);
+      process.exit(1);
+    }
+
+    console.log('plugin.xml updated successfully.');
+  });
+});

package/files/finalrelease

@@ -12,6 +12,7 @@ import { createInterface } from 'readline';
 
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
+import { syncAndroidR8Rules } from './buildCodeplay/fix-optimize-builld/restore-android-r8-rules.cjs';
 
 /* const path = require('path');
 const fs = require('fs'); */
@@ -744,6 +745,7 @@ function findGradleBlock(content, headerPattern) {
 }
 
 function ensureReleaseCodeOptimization() {
+    syncAndroidR8Rules(process.cwd(), { installGradleHook: true });
     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.');
@@ -957,11 +959,7 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
             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
-            minificationContent = minificationContent.replace(/\bminifyEnabled\s*(?:=\s*)?(true|false)\b/, `minifyEnabled ${desiredMinify}`);
-            console.log(`Replaced minifyEnabled with ${desiredMinify}.`);
-        } else {
+        if (!/\bminifyEnabled\b/.test(minificationContent)) {
             // Insert minifyEnabled if not present
             minificationContent = `\n            minifyEnabled ${desiredMinify}${minificationContent}`;
             console.log(`✅ Inserted minifyEnabled ${desiredMinify} into release block.`);
@@ -993,7 +991,7 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
 
         // Write the updated gradle content back to build.gradle
         writeFileSync(gradleFilePath, updatedGradleContent, 'utf8');
-        console.log(`✅ Updated build.gradle with versionCode: ${finalVersionCode}, versionName: ${finalVersionName}, resConfigs "en" and "minifyEnabled true"`);
+        console.log(`✅ Updated build.gradle with versionCode: ${finalVersionCode}, versionName: ${finalVersionName}, resConfigs "en"; existing minification settings preserved.`);
 
         let baselineProfileChecked = false;
         for (const id of storeIds) {

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

@@ -1,46 +1,46 @@
-const { execFileSync, spawnSync } = require('child_process');
-const path = require('path');
-const { syncGeneratedProfileBackup } = require('./setup-baseline-profile.js');
-
-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;
-  if (process.exitCode === 0) {
-    syncGeneratedProfileBackup({ backupOnly: true });
-  }
-}
-
-try {
-  main();
-} catch (error) {
-  console.error(`Baseline Profile generation failed: ${error.message}`);
-  process.exitCode = 1;
-}
+const { execFileSync, spawnSync } = require('child_process');
+const path = require('path');
+const { syncGeneratedProfileBackup } = require('./setup-baseline-profile.js');
+
+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;
+  if (process.exitCode === 0) {
+    syncGeneratedProfileBackup({ backupOnly: true });
+  }
+}
+
+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.11.3",
+  "version": "4.11.4",
   "description": "Common build scripts and files",
   "scripts": {
     "postinstall": "node scripts/sync-files.js",

package/scripts/sync-files.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const { updateBuildScripts, removeVersionedBuildScripts } = require('../files/buildCodeplay/project-scripts.cjs');
+const { syncAndroidR8Rules } = require('../files/buildCodeplay/fix-optimize-builld/restore-android-r8-rules.cjs');
 
 function migrateAppScripts(projectRoot) {
   const root = path.resolve(projectRoot);
@@ -97,6 +98,7 @@ function install(options = {}) {
     }
   }
   migrateAppConfigurator(projectRoot);
+  syncAndroidR8Rules(projectRoot, { installGradleHook: true });
   pkg.scripts = scripts;
   fs.writeFileSync(packagePath, JSON.stringify(pkg, null, 2) + '\n');
   // Cleanup happens only after replacement assets and package commands exist.