codeplay-common 4.5.8 → 4.5.9

package/files/buildCodeplay/codeplayBeforeBuild-6.2.js

@@ -1278,7 +1278,10 @@ let _admobConfig;
 
 const androidPlatformPath = path.join(process.cwd(), 'android');
 const iosPlatformPath = path.join(process.cwd(), 'ios');
-const androidManifestPath = path.join(process.cwd(), 'android', 'app', 'src', 'main', 'AndroidManifest.xml');
+const androidManifestPath = path.join(process.cwd(), 'android', 'app', 'src', 'main', 'AndroidManifest.xml');
+const androidAppBuildGradlePath = path.join(process.cwd(), 'android', 'app', 'build.gradle');
+const AMAZON_WINDOW_EXTENSIONS_DEPENDENCY = 'implementation "androidx.window.extensions.core:core:1.0.0"';
+const AMAZON_WINDOW_EXTENSIONS_DEPENDENCY_PATTERN = /^[ \t]*implementation\s+["']androidx\.window\.extensions\.core:core:[^"']+["'][ \t]*(?:\r?\n)?/gm;
 const infoPlistPath = path.join(process.cwd(), 'ios', 'App', 'App', 'Info.plist');
 const resourcesPath = path.join(process.cwd(), 'resources', 'res');
 const androidResPath = path.join(process.cwd(), 'android', 'app', 'src', 'main', 'res');
@@ -3665,12 +3668,19 @@ const getCurrentStoreId = () => {
   if (!fs.existsSync(commonFilePath)) return 1;
 
   const commonFileContent = fs.readFileSync(commonFilePath, "utf8");
-  const storeIdMatch = commonFileContent.match(/export\s+let\s+_storeid\s*=\s*import\.meta\.env\.VITE_STORE_ID\s*\|\|\s*(\d+)\s*;/);
-
-  return storeIdMatch ? Number(storeIdMatch[1]) : 1;
-};
+  const environmentStoreIdMatch = commonFileContent.match(
+    /^[ \t]*export\s+let\s+_storeid\s*=\s*import\.meta\.env\.VITE_STORE_ID\s*\|\|\s*(\d+)\s*;/m
+  );
+  if (environmentStoreIdMatch) return Number(environmentStoreIdMatch[1]);
+
+  const directStoreIdMatch = commonFileContent.match(
+    /^[ \t]*export\s+let\s+_storeid\s*=\s*(\d+)\s*;/m
+  );
+
+  return directStoreIdMatch ? Number(directStoreIdMatch[1]) : 1;
+};
 
-const getRevenueCatStoreState = (iapConfig) => {
+const getRevenueCatStoreState = (iapConfig) => {
   const storeId = getCurrentStoreId();
   const configuration = iapConfig.configuration || {};
   const storeMap = {
@@ -3700,10 +3710,43 @@ const getRevenueCatStoreState = (iapConfig) => {
   return {
     storeId,
     store: storeMap[storeId] || null
-  };
-};
-
-const ensureAndroidPermission = (permission, enabled) => {
+  };
+};
+
+const syncAmazonFireWebViewDependency = (enabled) => {
+  if (!fs.existsSync(androidAppBuildGradlePath)) {
+    console.error(`❌ Android app build.gradle not found: ${androidAppBuildGradlePath}`);
+    process.exit(1);
+  }
+
+  const currentContent = fs.readFileSync(androidAppBuildGradlePath, "utf8");
+  let nextContent = currentContent.replace(AMAZON_WINDOW_EXTENSIONS_DEPENDENCY_PATTERN, "");
+
+  if (enabled) {
+    const newline = nextContent.includes("\r\n") ? "\r\n" : "\n";
+    const dependenciesHeaderPattern = /(^dependencies[ \t]*\{[ \t]*\r?\n)/m;
+
+    if (!dependenciesHeaderPattern.test(nextContent)) {
+      console.error(`❌ dependencies block not found in ${androidAppBuildGradlePath}`);
+      process.exit(1);
+    }
+
+    nextContent = nextContent.replace(
+      dependenciesHeaderPattern,
+      `$1    ${AMAZON_WINDOW_EXTENSIONS_DEPENDENCY}${newline}`
+    );
+  }
+
+  if (nextContent !== currentContent) {
+    fs.writeFileSync(androidAppBuildGradlePath, nextContent, "utf8");
+  }
+
+  console.log(enabled
+    ? "✅ Amazon Fire WebView compatibility dependency enabled for Store ID 7."
+    : "ℹ️ Amazon Fire WebView compatibility dependency disabled for this store.");
+};
+
+const ensureAndroidPermission = (permission, enabled) => {
   if (!fs.existsSync(androidManifestPath)) return false;
 
   let manifestContent = fs.readFileSync(androidManifestPath, "utf8");
@@ -3730,14 +3773,15 @@ const ensureAndroidPermission = (permission, enabled) => {
   return true;
 };
 
-const syncRevenueCatIapSetup = () => {
-  const admobConfig = getAdmobIapConfig();
-  const iapConfig = admobConfig?.IAP;
-
-  if (!iapConfig) {
-    console.log("ℹ️ IAP configuration not found. Skipping RevenueCat package sync.");
-    return;
-  }
+const syncRevenueCatIapSetup = () => {
+  const admobConfig = getAdmobIapConfig();
+  const iapConfig = admobConfig?.IAP;
+
+  if (!iapConfig) {
+    syncAmazonFireWebViewDependency(false);
+    console.log("ℹ️ IAP configuration not found. Skipping RevenueCat package sync.");
+    return;
+  }
 
   ensureIapDesignInCapacitorConfig(iapConfig);
 
@@ -3745,8 +3789,9 @@ const syncRevenueCatIapSetup = () => {
     iapConfig.playstore === true ||
     iapConfig.ios === true ||
     iapConfig.amazon === true;
-  const { storeId, store } = getRevenueCatStoreState(iapConfig);
-  const revenueCatEnabledForCurrentStore = store?.enabled === true;
+  const { storeId, store } = getRevenueCatStoreState(iapConfig);
+  const revenueCatEnabledForCurrentStore = store?.enabled === true;
+  syncAmazonFireWebViewDependency(storeId === 7 && iapConfig.amazon === true);
 
   if (revenueCatEnabledForCurrentStore && !store.apiKey) {
     console.error(`❌ RevenueCat IAP is enabled for ${store.name} but ${store.apiKeyName} is missing.`);

package/files/finalrelease

@@ -679,7 +679,7 @@ const gradleFilePath = join("android", "app", "build.gradle");
 const gradleContent = readFileSync(gradleFilePath, 'utf8');
 
 // Return the character range of a Gradle block, allowing nested blocks inside it.
-function findGradleBlock(content, headerPattern) {
+function findGradleBlock(content, headerPattern) {
     const headerMatch = content.match(headerPattern);
     if (!headerMatch) return null;
     const openingBrace = content.indexOf('{', headerMatch.index + headerMatch[0].length);
@@ -697,10 +697,41 @@ function findGradleBlock(content, headerPattern) {
         else if (character === '{') depth += 1;
         else if (character === '}' && --depth === 0) return { start: openingBrace + 1, end: index };
     }
-    return null;
-}
-
-const versionCodeMatch = gradleContent.match(/versionCode\s+(\d+)/);
+    return null;
+}
+
+const amazonWindowExtensionsDependency = 'implementation "androidx.window.extensions.core:core:1.0.0"';
+const amazonWindowExtensionsDependencyPattern = /^[ \t]*implementation\s+["']androidx\.window\.extensions\.core:core:[^"']+["'][ \t]*(?:\r?\n)?/gm;
+
+function setAmazonWindowExtensionsDependency(enabled) {
+    const currentGradleContent = readFileSync(gradleFilePath, 'utf8');
+    let nextGradleContent = currentGradleContent.replace(amazonWindowExtensionsDependencyPattern, '');
+
+    if (enabled) {
+        const dependenciesBlock = findGradleBlock(nextGradleContent, /^\s*dependencies\s*/m);
+        if (!dependenciesBlock) {
+            throw new Error(`The dependencies block was not found in ${gradleFilePath}.`);
+        }
+
+        const newline = nextGradleContent.includes('\r\n') ? '\r\n' : '\n';
+        const contentBeforeClosingBrace = nextGradleContent.slice(0, dependenciesBlock.end);
+        const linePrefix = contentBeforeClosingBrace.endsWith('\n') ? '' : newline;
+        nextGradleContent = contentBeforeClosingBrace
+            + linePrefix
+            + `    ${amazonWindowExtensionsDependency}${newline}`
+            + nextGradleContent.slice(dependenciesBlock.end);
+    }
+
+    if (nextGradleContent !== currentGradleContent) {
+        writeFileSync(gradleFilePath, nextGradleContent, 'utf8');
+    }
+
+    console.log(enabled
+        ? '✅ Added Amazon Fire WebView compatibility dependency for Store ID 7.'
+        : 'ℹ️  Amazon Fire WebView compatibility dependency is not included for this build.');
+}
+
+const versionCodeMatch = gradleContent.match(/versionCode\s+(\d+)/);
 const versionNameMatch = gradleContent.match(/versionName\s+"([^"]+)"/);
 
 const versionCode = versionCodeMatch ? versionCodeMatch[1] : '';
@@ -854,6 +885,8 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
             }
             try {
                 applyFlowchartStoreApi(id);
+                const shouldIncludeAmazonWindowExtensions = String(id) === '7' && amazon === true;
+                setAmazonWindowExtensionsDependency(shouldIncludeAmazonWindowExtensions);
                 // Modify the minSdkVersion based on the store
 
 
@@ -969,9 +1002,11 @@ rl.question('Enter new versionCode (press enter to keep current): ', (newVersion
             } catch (error) {
                 console.error(`❌ Error during build for Store ID ${id}:`, error);
                 restoreFlowchartStoreApi();
+                setAmazonWindowExtensionsDependency(false);
                 process.exit(1);
             } finally {
                 restoreFlowchartStoreApi();
+                setAmazonWindowExtensionsDependency(false);
             }
         });
 

package/package.json

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