expo-iap 3.1.20 → 3.1.22

package/openiap-versions.json

@@ -1,5 +1,5 @@
 {
   "apple": "1.2.30",
-  "google": "1.3.2",
+  "google": "1.3.4",
   "gql": "1.2.3"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-iap",
-  "version": "3.1.20",
+  "version": "3.1.22",
   "description": "In App Purchase module in Expo",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/plugin/build/withIAP.js

@@ -72,19 +72,23 @@ const modifyAppBuildGradle = (gradle, language, isHorizonEnabled) => {
     let modified = gradle;
     // Determine which flavor to use based on isHorizonEnabled
     const flavor = isHorizonEnabled ? 'horizon' : 'play';
+    // Use openiap-google-horizon artifact when horizon is enabled
+    const artifactId = isHorizonEnabled
+        ? 'openiap-google-horizon'
+        : 'openiap-google';
     // Ensure OpenIAP dependency exists at desired version in app-level build.gradle(.kts)
     const impl = (ga, v) => language === 'kotlin'
         ? `    implementation("${ga}:${v}")`
         : `    implementation "${ga}:${v}"`;
-    const openiapDep = impl('io.github.hyochan.openiap:openiap-google', OPENIAP_ANDROID_VERSION);
-    // 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 openiapDep = impl(`io.github.hyochan.openiap:${artifactId}`, OPENIAP_ANDROID_VERSION);
+    // Remove any existing openiap-google or openiap-google-horizon lines (any version, groovy/kotlin, implementation/api)
+    const openiapAnyLine = /^\s*(?:implementation|api)\s*\(?\s*["']io\.github\.hyochan\.openiap:openiap-google(?:-horizon)?:[^"']+["']\s*\)?\s*$/gm;
     const hadExisting = openiapAnyLine.test(modified);
     if (hadExisting) {
         modified = modified.replace(openiapAnyLine, '').replace(/\n{3,}/g, '\n\n');
     }
     // Ensure the desired dependency line is present
-    if (!new RegExp(String.raw `io\.github\.hyochan\.openiap:openiap-google:${OPENIAP_ANDROID_VERSION}`).test(modified)) {
+    if (!new RegExp(String.raw `io\.github\.hyochan\.openiap:${artifactId}:${OPENIAP_ANDROID_VERSION}`).test(modified)) {
         // Insert just after the opening `dependencies {` line
         modified = addLineToGradle(modified, /dependencies\s*{/, openiapDep, 1);
         logOnce(hadExisting
@@ -124,6 +128,20 @@ const withIapAndroid = (config, props) => {
             return config;
         });
     }
+    // Set horizonEnabled property in gradle.properties so expo-iap module can pick it up
+    config = (0, config_plugins_1.withGradleProperties)(config, (config) => {
+        const horizonValue = props?.isHorizonEnabled ?? false;
+        // Remove any existing horizonEnabled entries
+        config.modResults = config.modResults.filter((item) => item.type !== 'property' || item.key !== 'horizonEnabled');
+        // Add the horizonEnabled property
+        config.modResults.push({
+            type: 'property',
+            key: 'horizonEnabled',
+            value: String(horizonValue),
+        });
+        logOnce(`✅ Set horizonEnabled=${horizonValue} in gradle.properties`);
+        return config;
+    });
     // Note: missingDimensionStrategy for local dev is handled in withLocalOpenIAP
     config = (0, config_plugins_1.withAndroidManifest)(config, (config) => {
         const manifest = config.modResults;
@@ -153,20 +171,22 @@ const withIapAndroid = (config, props) => {
                 application['meta-data'] = [];
             }
             const metaData = application['meta-data'];
+            // Use the correct meta-data name for Horizon Platform SDK
+            const horizonMetaDataName = 'com.meta.horizon.platform.ovr.OCULUS_APP_ID';
             const horizonAppIdMeta = {
                 $: {
-                    'android:name': 'com.oculus.vr.APP_ID',
+                    'android:name': horizonMetaDataName,
                     'android:value': props.horizonAppId,
                 },
             };
-            const existingIndex = metaData.findIndex((m) => m.$['android:name'] === 'com.oculus.vr.APP_ID');
+            const existingIndex = metaData.findIndex((m) => m.$['android:name'] === horizonMetaDataName);
             if (existingIndex !== -1) {
                 metaData[existingIndex] = horizonAppIdMeta;
-                logOnce(`✅ Updated com.oculus.vr.APP_ID to ${props.horizonAppId} in AndroidManifest.xml`);
+                logOnce(`✅ Updated ${horizonMetaDataName} to ${props.horizonAppId} in AndroidManifest.xml`);
             }
             else {
                 metaData.push(horizonAppIdMeta);
-                logOnce(`✅ Added com.oculus.vr.APP_ID: ${props.horizonAppId} to AndroidManifest.xml`);
+                logOnce(`✅ Added ${horizonMetaDataName}: ${props.horizonAppId} to AndroidManifest.xml`);
             }
         }
         return config;
@@ -179,31 +199,23 @@ const withIapIOS = (config, options) => {
     if (options) {
         config = (0, withIosAlternativeBilling_1.withIosAlternativeBilling)(config, options);
     }
-    return (0, config_plugins_1.withDangerousMod)(config, [
-        'ios',
-        async (config) => {
-            const { platformProjectRoot } = config.modRequest;
-            const podfilePath = path.join(platformProjectRoot, 'Podfile');
-            if (!fs.existsSync(podfilePath)) {
-                return config;
-            }
-            let content = fs.readFileSync(podfilePath, 'utf8');
-            // 1) Ensure CocoaPods CDN source is present at the very top
-            const cdnLine = `source 'https://cdn.cocoapods.org/'`;
-            if (!content.includes(cdnLine)) {
-                content = `${cdnLine}\n\n${content}`;
-                logOnce('📦 expo-iap: Added CocoaPods CDN source to Podfile');
-            }
-            // 2) Remove any lingering local OpenIAP pod injection
-            const localPodRegex = /^\s*pod\s+'openiap'\s*,\s*:path\s*=>\s*['"][^'"]+['"][^\n]*$/gm;
-            if (localPodRegex.test(content)) {
-                content = content.replace(localPodRegex, '').replace(/\n{3,}/g, '\n\n');
-                logOnce('🧹 expo-iap: Removed local OpenIAP pod from Podfile');
-            }
-            fs.writeFileSync(podfilePath, content);
-            return config;
-        },
-    ]);
+    return (0, config_plugins_1.withPodfile)(config, (config) => {
+        let content = config.modResults.contents;
+        // 1) Ensure CocoaPods CDN source is present at the very top
+        const cdnLine = `source 'https://cdn.cocoapods.org/'`;
+        if (!content.includes(cdnLine)) {
+            content = `${cdnLine}\n\n${content}`;
+            logOnce('📦 expo-iap: Added CocoaPods CDN source to Podfile');
+        }
+        // 2) Remove any lingering local OpenIAP pod injection
+        const localPodRegex = /^\s*pod\s+'openiap'\s*,\s*:path\s*=>\s*['"][^'"]+['"][^\n]*$/gm;
+        if (localPodRegex.test(content)) {
+            content = content.replace(localPodRegex, '').replace(/\n{3,}/g, '\n\n');
+            logOnce('🧹 expo-iap: Removed local OpenIAP pod from Podfile');
+        }
+        config.modResults.contents = content;
+        return config;
+    });
 };
 const withIap = (config, options) => {
     try {

package/plugin/build/withLocalOpenIAP.js

@@ -70,7 +70,7 @@ const withLocalOpenIAP = (config, props) => {
         }
         return null;
     };
-    // iOS: inject local pod path
+    // iOS: inject local pod path with wrapper podspec
     config = (0, config_plugins_1.withDangerousMod)(config, [
         'ios',
         async (config) => {
@@ -88,18 +88,23 @@ const withLocalOpenIAP = (config, props) => {
                 console.warn(`⚠️  Podfile not found at ${podfilePath}. Skipping.`);
                 return config;
             }
+            logOnce(`✅ Using local OpenIAP from: ${iosPath}`);
             let podfileContent = fs.readFileSync(podfilePath, 'utf8');
+            // Check if local OpenIAP pod is already configured
             if (podfileContent.includes("pod 'openiap',")) {
                 logOnce('✅ Local OpenIAP pod already configured');
                 return config;
             }
             const targetRegex = /target\s+['"][\w]+['"]\s+do\s*\n\s*use_expo_modules!/;
+            const relativePath = path
+                .relative(platformProjectRoot, iosPath)
+                .replace(/\\/g, '/');
             if (targetRegex.test(podfileContent)) {
                 podfileContent = podfileContent.replace(targetRegex, (match) => {
                     return `${match}
-  
+
   # Local OpenIAP pod for development (added by expo-iap plugin)
-  pod 'openiap', :path => '${iosPath}'`;
+  pod 'openiap', :path => '${relativePath}'`;
                 });
                 fs.writeFileSync(podfilePath, podfileContent);
                 logOnce(`✅ Added local OpenIAP pod at: ${iosPath}`);
@@ -195,11 +200,12 @@ const withLocalOpenIAP = (config, props) => {
         const flavor = props?.isHorizonEnabled ? 'horizon' : 'play';
         const strategyLine = `        missingDimensionStrategy "platform", "${flavor}"`;
         let contents = gradle.contents;
-        // Remove Maven deps (avoid duplicate classes with local module)
-        const mavenPattern = /^\s*(?:implementation|api)\s*\(?\s*["']io\.github\.hyochan\.openiap:openiap-google:[^"']+["']\s*\)?\s*$/gm;
+        // Remove Maven deps (both openiap-google and openiap-google-horizon)
+        // to avoid duplicate classes with local module
+        const mavenPattern = /^\s*(?:implementation|api)\s*\(?\s*["']io\.github\.hyochan\.openiap:openiap-google(?:-horizon)?:[^"']+["']\s*\)?\s*$/gm;
         if (mavenPattern.test(contents)) {
             contents = contents.replace(mavenPattern, '\n');
-            logOnce('🧹 Removed Maven openiap-google (using local module)');
+            logOnce('🧹 Removed Maven openiap-google* dependencies (using local module)');
         }
         // Add missingDimensionStrategy (required for flavored module)
         // Remove any existing platform strategies first to avoid duplicates

package/plugin/src/withIAP.ts

@@ -4,7 +4,8 @@ import {
   WarningAggregator,
   withAndroidManifest,
   withAppBuildGradle,
-  withDangerousMod,
+  withGradleProperties,
+  withPodfile,
 } from 'expo/config-plugins';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -64,19 +65,24 @@ const modifyAppBuildGradle = (
   // Determine which flavor to use based on isHorizonEnabled
   const flavor = isHorizonEnabled ? 'horizon' : 'play';
 
+  // Use openiap-google-horizon artifact when horizon is enabled
+  const artifactId = isHorizonEnabled
+    ? 'openiap-google-horizon'
+    : 'openiap-google';
+
   // 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}"`;
   const openiapDep = impl(
-    'io.github.hyochan.openiap:openiap-google',
+    `io.github.hyochan.openiap:${artifactId}`,
     OPENIAP_ANDROID_VERSION,
   );
 
-  // Remove any existing openiap-google lines (any version, groovy/kotlin, implementation/api)
+  // Remove any existing openiap-google or openiap-google-horizon lines (any version, groovy/kotlin, implementation/api)
   const openiapAnyLine =
-    /^\s*(?:implementation|api)\s*\(?\s*["']io\.github\.hyochan\.openiap:openiap-google:[^"']+["']\s*\)?\s*$/gm;
+    /^\s*(?:implementation|api)\s*\(?\s*["']io\.github\.hyochan\.openiap:openiap-google(?:-horizon)?:[^"']+["']\s*\)?\s*$/gm;
   const hadExisting = openiapAnyLine.test(modified);
   if (hadExisting) {
     modified = modified.replace(openiapAnyLine, '').replace(/\n{3,}/g, '\n\n');
@@ -85,7 +91,7 @@ const modifyAppBuildGradle = (
   // Ensure the desired dependency line is present
   if (
     !new RegExp(
-      String.raw`io\.github\.hyochan\.openiap:openiap-google:${OPENIAP_ANDROID_VERSION}`,
+      String.raw`io\.github\.hyochan\.openiap:${artifactId}:${OPENIAP_ANDROID_VERSION}`,
     ).test(modified)
   ) {
     // Insert just after the opening `dependencies {` line
@@ -155,6 +161,27 @@ const withIapAndroid: ConfigPlugin<
     });
   }
 
+  // Set horizonEnabled property in gradle.properties so expo-iap module can pick it up
+  config = withGradleProperties(config, (config) => {
+    const horizonValue = props?.isHorizonEnabled ?? false;
+
+    // Remove any existing horizonEnabled entries
+    config.modResults = config.modResults.filter(
+      (item) => item.type !== 'property' || item.key !== 'horizonEnabled',
+    );
+
+    // Add the horizonEnabled property
+    config.modResults.push({
+      type: 'property',
+      key: 'horizonEnabled',
+      value: String(horizonValue),
+    });
+
+    logOnce(`✅ Set horizonEnabled=${horizonValue} in gradle.properties`);
+
+    return config;
+  });
+
   // Note: missingDimensionStrategy for local dev is handled in withLocalOpenIAP
 
   config = withAndroidManifest(config, (config) => {
@@ -195,26 +222,29 @@ const withIapAndroid: ConfigPlugin<
       }
 
       const metaData = application['meta-data'];
+
+      // Use the correct meta-data name for Horizon Platform SDK
+      const horizonMetaDataName = 'com.meta.horizon.platform.ovr.OCULUS_APP_ID';
       const horizonAppIdMeta = {
         $: {
-          'android:name': 'com.oculus.vr.APP_ID',
+          'android:name': horizonMetaDataName,
           'android:value': props.horizonAppId,
         },
       };
 
       const existingIndex = metaData.findIndex(
-        (m) => m.$['android:name'] === 'com.oculus.vr.APP_ID',
+        (m) => m.$['android:name'] === horizonMetaDataName,
       );
 
       if (existingIndex !== -1) {
         metaData[existingIndex] = horizonAppIdMeta;
         logOnce(
-          `✅ Updated com.oculus.vr.APP_ID to ${props.horizonAppId} in AndroidManifest.xml`,
+          `✅ Updated ${horizonMetaDataName} to ${props.horizonAppId} in AndroidManifest.xml`,
         );
       } else {
         metaData.push(horizonAppIdMeta);
         logOnce(
-          `✅ Added com.oculus.vr.APP_ID: ${props.horizonAppId} to AndroidManifest.xml`,
+          `✅ Added ${horizonMetaDataName}: ${props.horizonAppId} to AndroidManifest.xml`,
         );
       }
     }
@@ -235,37 +265,27 @@ const withIapIOS: ConfigPlugin<IOSAlternativeBillingConfig | undefined> = (
     config = withIosAlternativeBilling(config, options);
   }
 
-  return withDangerousMod(config, [
-    'ios',
-    async (config) => {
-      const {platformProjectRoot} = config.modRequest;
-      const podfilePath = path.join(platformProjectRoot, 'Podfile');
+  return withPodfile(config, (config) => {
+    let content = config.modResults.contents;
 
-      if (!fs.existsSync(podfilePath)) {
-        return config;
-      }
-
-      let content = fs.readFileSync(podfilePath, 'utf8');
-
-      // 1) Ensure CocoaPods CDN source is present at the very top
-      const cdnLine = `source 'https://cdn.cocoapods.org/'`;
-      if (!content.includes(cdnLine)) {
-        content = `${cdnLine}\n\n${content}`;
-        logOnce('📦 expo-iap: Added CocoaPods CDN source to Podfile');
-      }
+    // 1) Ensure CocoaPods CDN source is present at the very top
+    const cdnLine = `source 'https://cdn.cocoapods.org/'`;
+    if (!content.includes(cdnLine)) {
+      content = `${cdnLine}\n\n${content}`;
+      logOnce('📦 expo-iap: Added CocoaPods CDN source to Podfile');
+    }
 
-      // 2) Remove any lingering local OpenIAP pod injection
-      const localPodRegex =
-        /^\s*pod\s+'openiap'\s*,\s*:path\s*=>\s*['"][^'"]+['"][^\n]*$/gm;
-      if (localPodRegex.test(content)) {
-        content = content.replace(localPodRegex, '').replace(/\n{3,}/g, '\n\n');
-        logOnce('🧹 expo-iap: Removed local OpenIAP pod from Podfile');
-      }
+    // 2) Remove any lingering local OpenIAP pod injection
+    const localPodRegex =
+      /^\s*pod\s+'openiap'\s*,\s*:path\s*=>\s*['"][^'"]+['"][^\n]*$/gm;
+    if (localPodRegex.test(content)) {
+      content = content.replace(localPodRegex, '').replace(/\n{3,}/g, '\n\n');
+      logOnce('🧹 expo-iap: Removed local OpenIAP pod from Podfile');
+    }
 
-      fs.writeFileSync(podfilePath, content);
-      return config;
-    },
-  ]);
+    config.modResults.contents = content;
+    return config;
+  });
 };
 
 export interface ExpoIapPluginOptions {

package/plugin/src/withLocalOpenIAP.ts

@@ -61,7 +61,7 @@ const withLocalOpenIAP: ConfigPlugin<
     return null;
   };
 
-  // iOS: inject local pod path
+  // iOS: inject local pod path with wrapper podspec
   config = withDangerousMod(config, [
     'ios',
     async (config) => {
@@ -82,8 +82,12 @@ const withLocalOpenIAP: ConfigPlugin<
         console.warn(`⚠️  Podfile not found at ${podfilePath}. Skipping.`);
         return config;
       }
+
+      logOnce(`✅ Using local OpenIAP from: ${iosPath}`);
+
       let podfileContent = fs.readFileSync(podfilePath, 'utf8');
 
+      // Check if local OpenIAP pod is already configured
       if (podfileContent.includes("pod 'openiap',")) {
         logOnce('✅ Local OpenIAP pod already configured');
         return config;
@@ -91,13 +95,16 @@ const withLocalOpenIAP: ConfigPlugin<
 
       const targetRegex =
         /target\s+['"][\w]+['"]\s+do\s*\n\s*use_expo_modules!/;
+      const relativePath = path
+        .relative(platformProjectRoot, iosPath)
+        .replace(/\\/g, '/');
 
       if (targetRegex.test(podfileContent)) {
         podfileContent = podfileContent.replace(targetRegex, (match) => {
           return `${match}
-  
+
   # Local OpenIAP pod for development (added by expo-iap plugin)
-  pod 'openiap', :path => '${iosPath}'`;
+  pod 'openiap', :path => '${relativePath}'`;
         });
         fs.writeFileSync(podfilePath, podfileContent);
         logOnce(`✅ Added local OpenIAP pod at: ${iosPath}`);
@@ -224,12 +231,15 @@ const withLocalOpenIAP: ConfigPlugin<
 
     let contents = gradle.contents;
 
-    // Remove Maven deps (avoid duplicate classes with local module)
+    // Remove Maven deps (both openiap-google and openiap-google-horizon)
+    // to avoid duplicate classes with local module
     const mavenPattern =
-      /^\s*(?:implementation|api)\s*\(?\s*["']io\.github\.hyochan\.openiap:openiap-google:[^"']+["']\s*\)?\s*$/gm;
+      /^\s*(?:implementation|api)\s*\(?\s*["']io\.github\.hyochan\.openiap:openiap-google(?:-horizon)?:[^"']+["']\s*\)?\s*$/gm;
     if (mavenPattern.test(contents)) {
       contents = contents.replace(mavenPattern, '\n');
-      logOnce('🧹 Removed Maven openiap-google (using local module)');
+      logOnce(
+        '🧹 Removed Maven openiap-google* dependencies (using local module)',
+      );
     }
 
     // Add missingDimensionStrategy (required for flavored module)

package/src/index.ts

@@ -1,5 +1,5 @@
 // External dependencies
-import {NativeModulesProxy} from 'expo-modules-core';
+import {requireNativeModule} from 'expo-modules-core';
 import {Platform} from 'react-native';
 
 // Internal modules
@@ -80,7 +80,7 @@ type ExpoIapEmitter = {
 
 // Ensure the emitter has proper EventEmitter interface
 export const emitter = (ExpoIapModule ||
-  NativeModulesProxy.ExpoIap) as ExpoIapEmitter;
+  requireNativeModule('ExpoIap')) as ExpoIapEmitter;
 
 /**
  * TODO(v3.1.0): Remove legacy 'inapp' alias once downstream apps migrate to 'in-app'.