chore(plugin): drop legacy billing/gms cleanup; target openiap-google only

Author: hyochan

android/build.gradle

@@ -58,6 +58,6 @@ dependencies {
       implementation project(":openiap-google")
     } else {
       // Fallback to published artifact when local project isn't linked
-      implementation "io.github.hyochan.openiap:openiap-google:1.0.1"
+      implementation "io.github.hyochan.openiap:openiap-google:1.1.0"
     }
 }

plugin/src/withIAP.ts

@@ -49,29 +49,32 @@ const modifyAppBuildGradle = (
 ): string => {
   let modified = gradle;
 
-  // Add OpenIAP dependency to app-level build.gradle(.kts)
+  // Ensure OpenIAP dependency exists at desired version in app-level build.gradle(.kts)
   const impl = (ga: string, v: string) =>
     language === 'kotlin'
       ? `    implementation("${ga}:${v}")`
       : `    implementation "${ga}:${v}"`;
   // Pin OpenIAP Google library to 1.1.0
   const openiapDep = impl('io.github.hyochan.openiap:openiap-google', '1.1.0');
 
-  const hasGA = (ga: string) =>
-    new RegExp(String.raw`\b(?:implementation|api)\s*\(?["']${ga}:`, 'm').test(
-      modified,
-    );
-
-  let hasAddedDependency = false;
-
-  if (!hasGA('io.github.hyochan.openiap:openiap-google')) {
-    modified = addLineToGradle(modified, /dependencies\s*{/, openiapDep, 0);
-    hasAddedDependency = true;
+  // Remove any existing openiap-google lines (any version, groovy/kotlin, implementation/api)
+  const openiapAnyLine =
+    /^\s*(?:implementation|api)\s*\(?\s*["']io\.github\.hyochan\.openiap:openiap-google:[^"']+["']\s*\)?\s*$/gm;
+  const hadExisting = openiapAnyLine.test(modified);
+  if (hadExisting) {
+    modified = modified.replace(openiapAnyLine, '').replace(/\n{3,}/g, '\n\n');
   }
 
-  // Log only once and only if we actually added dependencies
-  if (hasAddedDependency)
-    logOnce('🛠️ expo-iap: Added OpenIAP dependency to build.gradle');
+  // Ensure the desired dependency line is present
+  if (!new RegExp(String.raw`io\.github\.hyochan\.openiap:openiap-google:1\.1\.0`).test(modified)) {
+    // Insert just after the opening `dependencies {` line
+    modified = addLineToGradle(modified, /dependencies\s*{/, openiapDep, 1);
+    logOnce(
+      hadExisting
+        ? '🛠️ expo-iap: Replaced OpenIAP dependency with 1.1.0'
+        : '🛠️ expo-iap: Added OpenIAP dependency (1.1.0) to build.gradle',
+    );
+  }
 
   return modified;
 };
@@ -173,12 +176,13 @@ const withIap: ConfigPlugin<ExpoIapPluginOptions | void> = (
   options,
 ) => {
   try {
-    const isLocalDev = !!(options?.enableLocalDev || options?.localPath);
+    // Respect explicit flag; fall back to presence of localPath only when flag is unset
+    const isLocalDev = options?.enableLocalDev ?? !!options?.localPath;
     // Apply Android modifications (skip adding deps when linking local module)
     let result = withIapAndroid(config, {addDeps: !isLocalDev});
 
     // iOS: choose one path to avoid overlap
-    if (options?.enableLocalDev || options?.localPath) {
+    if (isLocalDev) {
       if (!options?.localPath) {
         WarningAggregator.addWarningIOS(
           'expo-iap',

plugin/src/withLocalOpenIAP.ts

@@ -196,10 +196,12 @@ const withLocalOpenIAP: ConfigPlugin<{localPath?: LocalPathOption} | void> = (
     const gradle = config.modResults;
     const dependencyLine = `    implementation project(':openiap-google')`;
 
-    // Remove any previously injected external deps that can conflict with the local module
+    // Remove any previously added Maven deps for openiap-google to avoid duplicate classes
     const removalPatterns = [
-      /\n\s*implementation\s+"com\.android\.billingclient:billing-ktx:[^"]+"\s*\n/g,
-      /\n\s*implementation\s+"com\.google\.android\.gms:play-services-base:[^"]+"\s*\n/g,
+      // Groovy DSL: implementation "io.github.hyochan.openiap:openiap-google:x.y.z" or api "..."
+      /^\s*(?:implementation|api)\s+["']io\.github\.hyochan\.openiap:openiap-google:[^"']+["']\s*$/gm,
+      // Kotlin DSL: implementation("io.github.hyochan.openiap:openiap-google:x.y.z") or api("...")
+      /^\s*(?:implementation|api)\s*\(\s*["']io\.github\.hyochan\.openiap:openiap-google:[^"']+["']\s*\)\s*$/gm,
     ];
     let contents = gradle.contents;
     let removedAny = false;
@@ -211,9 +213,7 @@ const withLocalOpenIAP: ConfigPlugin<{localPath?: LocalPathOption} | void> = (
     }
     if (removedAny) {
       gradle.contents = contents;
-      console.log(
-        '🧹 Removed external Play Billing/GMS deps to use local :openiap-google',
-      );
+      console.log('🧹 Removed Maven openiap-google to use local :openiap-google');
     }
     if (!gradle.contents.includes(dependencyLine)) {
       const anchor = /dependencies\s*\{/m;
@@ -244,8 +244,10 @@ const withLocalOpenIAP: ConfigPlugin<{localPath?: LocalPathOption} | void> = (
         if (fs.existsSync(appBuildGradle)) {
           let contents = fs.readFileSync(appBuildGradle, 'utf8');
           const patterns = [
-            /\n\s*implementation\s+"com\.android\.billingclient:billing-ktx:[^"]+"\s*\n/g,
-            /\n\s*implementation\s+"com\.google\.android\.gms:play-services-base:[^"]+"\s*\n/g,
+            // Groovy DSL
+            /^\s*(?:implementation|api)\s+["']io\.github\.hyochan\.openiap:openiap-google:[^"']+["']\s*$/gm,
+            // Kotlin DSL
+            /^\s*(?:implementation|api)\s*\(\s*["']io\.github\.hyochan\.openiap:openiap-google:[^"']+["']\s*\)\s*$/gm,
           ];
           let changed = false;
           for (const p of patterns) {
@@ -257,7 +259,7 @@ const withLocalOpenIAP: ConfigPlugin<{localPath?: LocalPathOption} | void> = (
           if (changed) {
             fs.writeFileSync(appBuildGradle, contents);
             console.log(
-              '🧹 expo-iap: Cleaned app/build.gradle billing/gms deps for local :openiap-google',
+              '🧹 expo-iap: Cleaned Maven openiap-google for local :openiap-google',
             );
           }
         }