codeplay-common 1.8.4 → 1.8.6

package/files/buildCodeplay/{codeplayBeforeBuild-4.3.js → codeplayBeforeBuild-4.4.js}

@@ -108,7 +108,14 @@ if (editorDirs.length === 0) {
 }
 else
 {
-  const latestEditorDir = editorDirs[editorDirs.length - 1];
+
+  const latestEditorDir = editorDirs.sort((a, b) => {
+    const versionA = parseFloat(a.split('-')[1]);
+    const versionB = parseFloat(b.split('-')[1]);
+    return versionB - versionA;
+  })[0];
+
+  //const latestEditorDir = editorDirs[editorDirs.length - 1];
   const runJsPath = path.join(baseDir, latestEditorDir, "run.js");
 
   if (!fs.existsSync(runJsPath)) {
@@ -600,7 +607,8 @@ function validateAndroidBuildOptions() {
       "com.HTML.AngularJS.Codeplay",
       "com.html.codeplay.pro",
       "com.bootstrap.code.play",
-      "com.kids.learning.master"
+      "com.kids.learning.master",
+      "com.Simple.Barcode.Scanner"
     ]
   };
 

package/files/finalrelease21

@@ -242,33 +242,62 @@ const addPermission_AD_ID=async()=>{
         isAdmobFound = false;
     }
     
+        
 
-    if (isAdmobFound) {
-        // Check if AndroidManifest.xml exists
-        if (existsSync(androidManifestPath)) {
-            // Read the content of AndroidManifest.xml
-            let manifestContent = readFileSync(androidManifestPath, 'utf8');
-    
-            // Check if the ad_id permission already exists
-            const adIdPermission = '<uses-permission android:name="com.google.android.gms.permission.AD_ID" />';
-            if (!manifestContent.includes(adIdPermission)) {
-                console.log("ad_id permission not found. Adding to AndroidManifest.xml.");
-    
-                // Add the ad_id permission before the closing </manifest> tag
-                manifestContent = manifestContent.replace('</manifest>', `    ${adIdPermission}\n</manifest>`);
-    
-                // Write the updated manifest content back to AndroidManifest.xml
-                writeFileSync(androidManifestPath, manifestContent, 'utf8');
-                console.log("✅ ad_id permission added successfully.");
+if (isAdmobFound) {
+    if (existsSync(androidManifestPath)) {
+        let manifestContent = readFileSync(androidManifestPath, 'utf8');
+        let modified = false;
+
+        // --- Step 1: Ensure AD_ID permission exists ---
+        const adIdPermission = '<uses-permission android:name="com.google.android.gms.permission.AD_ID" />';
+        if (!manifestContent.includes(adIdPermission)) {
+            console.log("📄 AD_ID permission not found. Adding to AndroidManifest.xml.");
+            manifestContent = manifestContent.replace('</manifest>', `    ${adIdPermission}\n</manifest>`);
+            console.log("✅ AD_ID permission added successfully.");
+            modified = true;
+        } else {
+            console.log("ℹ️ AD_ID permission already exists in AndroidManifest.xml.");
+        }
+
+        // --- Step 2: Ensure OPTIMIZE_AD_LOADING meta-data exists ---
+        const optimizeAdMeta = `<meta-data android:name="com.google.android.gms.ads.flag.OPTIMIZE_AD_LOADING" android:value="true" />`;
+
+        if (!manifestContent.includes(optimizeAdMeta)) {
+            console.log("📄 OPTIMIZE_AD_LOADING meta-data not found. Adding to AndroidManifest.xml.");
+
+            const appTagPattern = /<application[^>]*>/;
+            if (appTagPattern.test(manifestContent)) {
+                manifestContent = manifestContent.replace(appTagPattern, match => `${match}\n        ${optimizeAdMeta}`);
+                console.log("✅ OPTIMIZE_AD_LOADING meta-data added successfully.");
+                modified = true;
             } else {
-                console.log("ℹ️  ad_id permission already exists in AndroidManifest.xml.");
+                console.error("❌ <application> tag not found in AndroidManifest.xml.");
             }
         } else {
-            console.error("❌ AndroidManifest.xml not found at the specified path.");
+            console.log("ℹ️ OPTIMIZE_AD_LOADING meta-data already exists in AndroidManifest.xml.");
+        }
+
+        // --- Step 3: Write only if modified ---
+        if (modified) {
+            writeFileSync(androidManifestPath, manifestContent, 'utf8');
+            console.log("💾 AndroidManifest.xml updated successfully.");
+        } else {
+            console.log("✅ No changes needed. AndroidManifest.xml is up to date.");
         }
+
     } else {
-        console.log("\x1b[33m%s\x1b[0m", "⚠️ No admob found, so permission.AD_ID is not added");
+        console.error("❌ AndroidManifest.xml not found at the specified path.");
     }
+} else {
+    console.log("\x1b[33m%s\x1b[0m", "⚠️ No AdMob found, so AD_ID permission and meta-data were not added");
+}
+
+
+
+
+
+
 }
 
 

package/package.json

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