codeplay-common 2.1.49 → 2.1.51

package/files/buildCodeplay/codeplayBeforeBuild-5.3.js

@@ -1359,6 +1359,39 @@ validateThemeFolderLocation()
 
 
 
+const validateAndRestoreSignDetails=()=>{
+
+  // Read config file
+  const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+
+  // Ensure android and buildOptions exist
+  if (!config.android) config.android = {};
+  if (!config.android.buildOptions) config.android.buildOptions = {};
+
+  // Update only if changed
+  let updated = false;
+
+  if (config.android.buildOptions.releaseType !== 'AAB') {
+    config.android.buildOptions.releaseType = 'AAB';
+    updated = true;
+  }
+
+  if (config.android.buildOptions.signingType !== 'jarsigner') {
+    config.android.buildOptions.signingType = 'jarsigner';
+    updated = true;
+  }
+
+  // Write back only if modified
+  if (updated) {
+    fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+    console.log('capacitor.config.json updated successfully.');
+  } else {
+    console.log('No changes needed.');
+  }
+
+}
+
+validateAndRestoreSignDetails()
 
 
 /*

package/files/finalrelease

@@ -49,7 +49,7 @@ const storeNames = {
 
 let isAdmobFound = false;
 
-const amazonMinSdkVersion=23;
+const amazonMinSdkVersion=24;
 
 const androidManifestPath = join("android", "app", "src", "main", "AndroidManifest.xml");
 
@@ -380,6 +380,50 @@ if (_isADMOB_ENABLED)
 
 
 
+let originalReleaseType, originalSigningType;
+
+function readCapacitorConfig() {
+    return JSON.parse(fs.readFileSync(capacitorConfigPath, 'utf8'));
+}
+
+function writeCapacitorConfig(config) {
+    fs.writeFileSync(capacitorConfigPath, JSON.stringify(config, null, 2), 'utf8');
+}
+
+function updateCapacitorConfig(releaseType, signingType) {
+    const config = readCapacitorConfig();
+
+    // Save original values once
+    if (originalReleaseType === undefined) originalReleaseType = config.android?.buildOptions?.releaseType || '';
+    if (originalSigningType === undefined) originalSigningType = config.android?.buildOptions?.signingType || '';
+
+    // Update values
+    config.android = config.android || {};
+    config.android.buildOptions = config.android.buildOptions || {};
+    config.android.buildOptions.releaseType = releaseType;
+    config.android.buildOptions.signingType = signingType;
+
+    writeCapacitorConfig(config);
+    console.log(`ℹ️ capacitor.config.json updated: releaseType=${releaseType}, signingType=${signingType}`);
+}
+
+function restoreCapacitorConfig() {
+    const config = readCapacitorConfig();
+    if (originalReleaseType !== undefined) config.android.buildOptions.releaseType = originalReleaseType;
+    if (originalSigningType !== undefined) config.android.buildOptions.signingType = originalSigningType;
+    writeCapacitorConfig(config);
+    console.log(`✅ capacitor.config.json restored to original values.`);
+}
+
+process.on('SIGINT', () => {
+    console.log('\n⚠️ Detected Ctrl+C, restoring capacitor.config.json...');
+    restoreCapacitorConfig();
+    process.exit(0);
+});
+
+process.on('exit', () => {
+    restoreCapacitorConfig();
+});
 
 
 
@@ -636,10 +680,20 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
                 // Build Android AAB or APK file based on store
                 console.log(`🏗️ Building release for ${storeName}...`);
 
-                let buildType = "AAB";
+/*                 let buildType = "AAB";
                 if (["VivoStore", "OppoStore", "MiStore"].includes(storeName)) {
                     buildType = "APK";
-                }
+                } */
+
+
+                // Determine build type and signing type per store
+                let buildType = ["VivoStore","OppoStore","MiStore"].includes(storeName) ? "APK" : "AAB";
+                let signingType = buildType === "APK" ? "apksigner" : "jarsigner";
+
+                // Update capacitor.config.json for this store
+                updateCapacitorConfig(buildType, signingType);
+
+
 
                 execSync('npx cap sync android', { stdio: 'inherit' });
                 execSync(`npx cap build android --androidreleasetype=${buildType}`, { stdio: 'inherit' });
@@ -794,6 +848,8 @@ function updateAndroidManifest(store, addPermission) {
     }
 }
 
+restoreCapacitorConfig();
+console.log("🏁 All builds completed, capacitor.config.json restored.");
 
 
 /* function updateAndroidManifest1(store, addPermission) {

package/package.json

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