codeplay-common 1.4.0 → 1.4.2

package/files/buildCodeplay/{codeplayBeforeBuild-2.0.js → codeplayBeforeBuild-2.1.js}

@@ -308,6 +308,44 @@ if (updated) {
 
 
 
+// To resolve the kotlin version issue, we need to update the kotlin version in the build.gradle file START
+
+// Build the path dynamically like you requested
+const gradlePath = path.join(
+  process.cwd(), 
+  'android', 
+  'build.gradle'
+);
+
+// Read the existing build.gradle
+let gradleContent = fs.readFileSync(gradlePath, 'utf8');
+
+// Add `ext.kotlin_version` if it's not already there
+if (!gradleContent.includes('ext.kotlin_version')) {
+  gradleContent = gradleContent.replace(
+    /buildscript\s*{/,
+    `buildscript {\n    ext.kotlin_version = '2.1.0'`
+  );
+}
+
+// Add Kotlin classpath if it's not already there
+if (!gradleContent.includes('org.jetbrains.kotlin:kotlin-gradle-plugin')) {
+  gradleContent = gradleContent.replace(
+    /dependencies\s*{([\s\S]*?)classpath 'com.android.tools.build:gradle:8.7.2'/,
+    `dependencies {\n        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")\n$1classpath 'com.android.tools.build:gradle:8.7.2'`
+  );
+}
+
+// Write back the modified content
+fs.writeFileSync(gradlePath, gradleContent, 'utf8');
+
+console.log('✅ Kotlin version updated in build.gradle.');
+
+// To resolve the kotlin version issue, we need to update the kotlin version in the build.gradle file END
+
+
+
+
 
 
 

package/files/{finalrelease16 → finalrelease17}

@@ -10,6 +10,8 @@ const storeNames = {
     "7": "AmazonStore"
 };
 
+const amazonMinSdkVersion=23;
+
 const androidManifestPath = path.join("android", "app", "src", "main", "AndroidManifest.xml");
 
 
@@ -259,11 +261,11 @@ const rl = readline.createInterface({
 
 // Ask for new versionCode
 rl.question('Enter new versionCode (press enter to keep current): ', (newVersionCode) => {
-    const finalVersionCode = newVersionCode || versionCode; // Use existing if no input
+    const finalVersionCode = versionCode; // Use existing if no input
 
     // Ask for new versionName
     rl.question('Enter new versionName (press enter to keep current): ', (newVersionName) => {
-        const finalVersionName = newVersionName || versionName; // Use existing if no input
+        const finalVersionName = versionName; // Use existing if no input
 
         // Log the final version details
         console.log(`📦 Final versionCode: ${finalVersionCode}`);
@@ -325,7 +327,7 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
 
             // Conditionally set the new file name
             let newFileName;
-            const storeName = storeNames[id];
+            let storeName = storeNames[id];
             
             managePackages(storeName);
 
@@ -337,6 +339,7 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
                 newFileName = `app-release-signed-${storeName}-b${finalVersionCode}-v${finalVersionName}.aab`;
             }
 
+            //storeName="amazon"
             const checkFullPath = path.join("AAB", newFileName); // Update to point to the new AAB directory
 
             // Modify minSdkVersion in variables.gradle for SamsungStore
@@ -361,13 +364,15 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
                     }
                 } else {
                     // For PlayStore and AmazonStore, ensure minSdkVersion is originalMinSdkVersion
-                    if (currentMinSdkVersion !== originalMinSdkVersion) {
-                        variablesGradleContent = variablesGradleContent.replace(/minSdkVersion\s*=\s*\d+/, `minSdkVersion = ${originalMinSdkVersion}`);
-                        console.log(`minSdkVersion reverted to ${originalMinSdkVersion} for ${storeName}`);
+                    //if (currentMinSdkVersion !== originalMinSdkVersion) {
+                        variablesGradleContent = variablesGradleContent.replace(/minSdkVersion\s*=\s*\d+/, `minSdkVersion = ${amazonMinSdkVersion}`);
+                        console.log(`minSdkVersion reverted to ${amazonMinSdkVersion} for ${storeName}`);
                         fs.writeFileSync(variablesGradleFilePath, variablesGradleContent);
-                    }
+                    //}
                 }
 
+                
+
                 // Run the Node.js script to modify plugin.xml
                 if (isAdmobFound) {
                     child_process.execSync('node buildCodeplay/modify-plugin-xml.js', { stdio: 'inherit' });
@@ -396,6 +401,12 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
                 child_process.execSync('npx cap build android --androidreleasetype=AAB', { stdio: 'inherit' });
 
 
+
+                variablesGradleContent = variablesGradleContent.replace(/minSdkVersion\s*=\s*\d+/, 'minSdkVersion = 24');
+                console.log('minSdkVersion revert to 24 (default)');
+                fs.writeFileSync(variablesGradleFilePath, variablesGradleContent);
+
+
                 // Rename the output AAB file
                 const oldFilePath = path.join(aabDirectory, "app-release-signed.aab");
                 if (fs.existsSync(oldFilePath)) {

package/package.json

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