@capgo/native-purchases 7.16.2 → 7.17.0

package/CapgoNativePurchases.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
   s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.exclude_files = '**/node_modules/**/*', '**/examples/**/*'
-  s.ios.deployment_target = '14.0'
+  s.ios.deployment_target = '15.0'
   s.dependency 'Capacitor'
   s.swift_version = '5.1'
 end

package/Package.swift

@@ -3,14 +3,14 @@ import PackageDescription
 
 let package = Package(
     name: "CapgoNativePurchases",
-    platforms: [.iOS(.v14)],
+    platforms: [.iOS(.v15)],
     products: [
         .library(
             name: "CapgoNativePurchases",
             targets: ["NativePurchasesPlugin"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0")
     ],
     targets: [
         .target(

package/android/build.gradle

@@ -1,8 +1,8 @@
 ext {
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.1'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.3.0'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.7.0'
 }
 
 buildscript {
@@ -11,18 +11,18 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.3'
+        classpath 'com.android.tools.build:gradle:8.13.0'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    namespace "ee.forgr.nativepurchases"
-    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
+    namespace = "ee.forgr.nativepurchases"
+    compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 24
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -34,7 +34,7 @@ android {
         }
     }
     lintOptions {
-        abortOnError false
+        abortOnError = false
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_21
@@ -50,7 +50,7 @@ repositories {
 
 dependencies {
     implementation "com.google.guava:guava:33.5.0-android"
-    def billing_version = "8.1.0"
+    def billing_version = "8.2.0"
     implementation "com.android.billingclient:billing:$billing_version"
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')

package/android/src/main/java/ee/forgr/nativepurchases/NativePurchasesPlugin.java

@@ -42,10 +42,12 @@ import org.json.JSONArray;
 @CapacitorPlugin(name = "NativePurchases")
 public class NativePurchasesPlugin extends Plugin {
 
-    private final String pluginVersion = "7.16.2";
+    private final String pluginVersion = "7.17.0";
     public static final String TAG = "NativePurchases";
     private static final Phaser semaphoreReady = new Phaser(1);
     private BillingClient billingClient;
+    private PluginCall pendingCall = null;
+    private BillingResult lastBillingError = null;
 
     @PluginMethod
     public void isBillingSupported(PluginCall call) {
@@ -110,6 +112,13 @@ public class NativePurchasesPlugin extends Plugin {
         } else {
             Log.d(TAG, "Billing client was already null");
         }
+
+        // Clear pending call and error state
+        if (pendingCall != null) {
+            Log.w(TAG, "Warning: Clearing pending call that was never resolved/rejected");
+            pendingCall = null;
+        }
+        lastBillingError = null;
     }
 
     private void handlePurchase(Purchase purchase, PluginCall purchaseCall) {
@@ -233,6 +242,12 @@ public class NativePurchasesPlugin extends Plugin {
 
     private void initBillingClient(PluginCall purchaseCall) {
         Log.d(TAG, "initBillingClient() called");
+        Log.d(TAG, "purchaseCall is null: " + (purchaseCall == null));
+
+        // Store the pending call so we can reject it if billing setup fails
+        this.pendingCall = purchaseCall;
+        this.lastBillingError = null;
+
         semaphoreWait();
         closeBillingClient();
         semaphoreUp();
@@ -278,9 +293,43 @@ public class NativePurchasesPlugin extends Plugin {
                     if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK) {
                         Log.d(TAG, "Billing setup successful, client is ready");
                         // The BillingClient is ready. You can query purchases here.
+                        lastBillingError = null;
                         semaphoreReady.countDown();
                     } else {
-                        Log.d(TAG, "Billing setup failed");
+                        Log.e(TAG, "Billing setup failed with code: " + billingResult.getResponseCode());
+                        Log.e(TAG, "Error message: " + billingResult.getDebugMessage());
+
+                        // Store the error for later use
+                        lastBillingError = billingResult;
+
+                        // Release the latch so the waiting thread can continue
+                        semaphoreReady.countDown();
+
+                        // Reject the pending call if there is one
+                        if (pendingCall != null) {
+                            Log.d(TAG, "Rejecting pending call due to billing setup failure");
+                            String errorMessage = "Billing service unavailable";
+                            switch (billingResult.getResponseCode()) {
+                                case BillingClient.BillingResponseCode.SERVICE_UNAVAILABLE:
+                                    errorMessage =
+                                        "Billing service unavailable. Please check your internet connection and Google Play Services.";
+                                    break;
+                                case BillingClient.BillingResponseCode.BILLING_UNAVAILABLE:
+                                    errorMessage = "Billing is not available on this device.";
+                                    break;
+                                case BillingClient.BillingResponseCode.FEATURE_NOT_SUPPORTED:
+                                    errorMessage = "This billing feature is not supported.";
+                                    break;
+                                case BillingClient.BillingResponseCode.SERVICE_DISCONNECTED:
+                                    errorMessage = "Billing service disconnected. Please try again.";
+                                    break;
+                                default:
+                                    errorMessage = "Billing setup failed: " + billingResult.getDebugMessage();
+                                    break;
+                            }
+                            pendingCall.reject("BILLING_SETUP_FAILED", errorMessage);
+                            pendingCall = null;
+                        }
                     }
                 }
 
@@ -295,10 +344,26 @@ public class NativePurchasesPlugin extends Plugin {
         try {
             Log.d(TAG, "Waiting for billing client setup to finish");
             semaphoreReady.await();
-            Log.d(TAG, "Billing client setup completed");
+            Log.d(TAG, "Billing client setup wait completed");
+
+            // Check if billing setup failed
+            if (lastBillingError != null) {
+                Log.e(TAG, "Billing setup failed, throwing exception");
+                throw new RuntimeException("Billing setup failed: " + lastBillingError.getDebugMessage());
+            }
+
+            Log.d(TAG, "Billing client setup completed successfully");
         } catch (InterruptedException e) {
-            Log.d(TAG, "InterruptedException while waiting for billing setup: " + e.getMessage());
+            Log.e(TAG, "InterruptedException while waiting for billing setup: " + e.getMessage());
             e.printStackTrace();
+            if (pendingCall != null) {
+                pendingCall.reject("BILLING_INTERRUPTED", "Billing setup was interrupted");
+                pendingCall = null;
+            }
+        } catch (RuntimeException e) {
+            Log.e(TAG, "RuntimeException during billing setup: " + e.getMessage());
+            // Don't reject here - already rejected in onBillingSetupFinished
+            throw e;
         }
     }
 
@@ -383,7 +448,14 @@ public class NativePurchasesPlugin extends Plugin {
         );
         QueryProductDetailsParams params = QueryProductDetailsParams.newBuilder().setProductList(productList).build();
         Log.d(TAG, "Initializing billing client for purchase");
-        this.initBillingClient(call);
+        try {
+            this.initBillingClient(call);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Failed to initialize billing client: " + e.getMessage());
+            closeBillingClient();
+            // Call already rejected in initBillingClient
+            return;
+        }
         try {
             Log.d(TAG, "Querying product details for purchase");
             billingClient.queryProductDetailsAsync(
@@ -434,9 +506,8 @@ public class NativePurchasesPlugin extends Plugin {
                             }
                             productDetailsParamsList.add(productDetailsParams.build());
                         }
-                        BillingFlowParams.Builder billingFlowBuilder = BillingFlowParams.newBuilder().setProductDetailsParamsList(
-                            productDetailsParamsList
-                        );
+                        BillingFlowParams.Builder billingFlowBuilder = BillingFlowParams.newBuilder()
+                            .setProductDetailsParamsList(productDetailsParamsList);
                         if (accountIdentifier != null && !accountIdentifier.isEmpty()) {
                             billingFlowBuilder.setObfuscatedAccountId(accountIdentifier);
                         }
@@ -520,7 +591,14 @@ public class NativePurchasesPlugin extends Plugin {
     public void restorePurchases(PluginCall call) {
         Log.d(TAG, "restorePurchases() called");
         Log.d(NativePurchasesPlugin.TAG, "restorePurchases");
-        this.initBillingClient(null);
+        try {
+            this.initBillingClient(call);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Failed to initialize billing client: " + e.getMessage());
+            closeBillingClient();
+            // Call already rejected in initBillingClient
+            return;
+        }
         this.processUnfinishedPurchases();
         call.resolve();
         Log.d(TAG, "restorePurchases() completed");
@@ -541,7 +619,14 @@ public class NativePurchasesPlugin extends Plugin {
 
         QueryProductDetailsParams params = QueryProductDetailsParams.newBuilder().setProductList(productList).build();
         Log.d(TAG, "Initializing billing client for single product query");
-        this.initBillingClient(call);
+        try {
+            this.initBillingClient(call);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Failed to initialize billing client: " + e.getMessage());
+            closeBillingClient();
+            // Call already rejected in initBillingClient
+            return;
+        }
         try {
             Log.d(TAG, "Querying product details");
             billingClient.queryProductDetailsAsync(
@@ -612,7 +697,7 @@ public class NativePurchasesPlugin extends Plugin {
                             Log.d(
                                 TAG,
                                 "Formatted price: " +
-                                    selectedOfferDetails.getPricingPhases().getPricingPhaseList().get(0).getFormattedPrice()
+                                selectedOfferDetails.getPricingPhases().getPricingPhaseList().get(0).getFormattedPrice()
                             );
                             Log.d(
                                 TAG,
@@ -655,7 +740,14 @@ public class NativePurchasesPlugin extends Plugin {
         Log.d(TAG, "Total products in query list: " + productList.size());
         QueryProductDetailsParams params = QueryProductDetailsParams.newBuilder().setProductList(productList).build();
         Log.d(TAG, "Initializing billing client for product query");
-        this.initBillingClient(call);
+        try {
+            this.initBillingClient(call);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Failed to initialize billing client: " + e.getMessage());
+            closeBillingClient();
+            // Call already rejected in initBillingClient
+            return;
+        }
         try {
             Log.d(TAG, "Querying product details");
             billingClient.queryProductDetailsAsync(
@@ -727,12 +819,12 @@ public class NativePurchasesPlugin extends Plugin {
                                 Log.d(
                                     TAG,
                                     "Formatted price: " +
-                                        selectedOfferDetails.getPricingPhases().getPricingPhaseList().get(0).getFormattedPrice()
+                                    selectedOfferDetails.getPricingPhases().getPricingPhaseList().get(0).getFormattedPrice()
                                 );
                                 Log.d(
                                     TAG,
                                     "Currency: " +
-                                        selectedOfferDetails.getPricingPhases().getPricingPhaseList().get(0).getPriceCurrencyCode()
+                                    selectedOfferDetails.getPricingPhases().getPricingPhaseList().get(0).getPriceCurrencyCode()
                                 );
                             }
                             product.put("isFamilyShareable", false);
@@ -817,7 +909,14 @@ public class NativePurchasesPlugin extends Plugin {
             return;
         }
 
-        this.initBillingClient(null);
+        try {
+            this.initBillingClient(call);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Failed to initialize billing client: " + e.getMessage());
+            closeBillingClient();
+            // Call already rejected in initBillingClient
+            return;
+        }
 
         JSONArray allPurchases = new JSONArray();
         AtomicInteger pendingQueries = new AtomicInteger((queryInApp ? 1 : 0) + (querySubs ? 1 : 0));
@@ -982,7 +1081,14 @@ public class NativePurchasesPlugin extends Plugin {
         }
 
         Log.d(TAG, "Manually acknowledging purchase with token: " + purchaseToken);
-        this.initBillingClient(null);
+        try {
+            this.initBillingClient(call);
+        } catch (RuntimeException e) {
+            Log.e(TAG, "Failed to initialize billing client: " + e.getMessage());
+            closeBillingClient();
+            // Call already rejected in initBillingClient
+            return;
+        }
 
         try {
             AcknowledgePurchaseParams acknowledgePurchaseParams = AcknowledgePurchaseParams.newBuilder()

package/ios/Sources/NativePurchasesPlugin/NativePurchasesPlugin.swift

@@ -24,7 +24,7 @@ public class NativePurchasesPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isEntitledToOldBusinessModel", returnType: CAPPluginReturnPromise)
     ]
 
-    private let pluginVersion: String = "7.16.2"
+    private let pluginVersion: String = "7.17.0"
     private var transactionUpdatesTask: Task<Void, Never>?
 
     @objc func getPluginVersion(_ call: CAPPluginCall) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/native-purchases",
-  "version": "7.16.2",
+  "version": "7.17.0",
   "description": "In-app Subscriptions Made Easy",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -24,6 +24,7 @@
   "bugs": {
     "url": "https://github.com/Cap-go/capacitor-native-purchases/issues"
   },
+  "homepage": "https://capgo.app/docs/plugins/native-purchases/",
   "keywords": [
     "capacitor",
     "plugin",
@@ -42,7 +43,7 @@
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
     "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
     "eslint": "eslint . --ext ts",
-    "prettier": "prettier \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
+    "prettier": "prettier-pretty-check \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
     "swiftlint": "node-swiftlint",
     "docgen": "docgen --api NativePurchasesPlugin --output-readme README.md --output-json dist/docs.json",
     "clean": "rimraf ./dist",
@@ -50,27 +51,28 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^7.0.0",
-    "@capacitor/cli": "^7.0.0",
-    "@capacitor/core": "^7.0.0",
-    "@capacitor/docgen": "^0.3.0",
-    "@capacitor/ios": "^7.0.0",
+    "@capacitor/android": "^8.0.0",
+    "@capacitor/cli": "^8.0.0",
+    "@capacitor/core": "^8.0.0",
+    "@capacitor/docgen": "^0.3.1",
+    "@capacitor/ios": "^8.0.0",
     "@ionic/eslint-config": "^0.4.0",
     "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^2.0.0",
-    "@types/node": "^24.0.0",
-    "eslint": "^8.57.0",
+    "@types/node": "^24.10.1",
+    "eslint": "^8.57.1",
     "eslint-plugin-import": "^2.31.0",
     "husky": "^9.1.7",
-    "prettier": "^3.4.2",
-    "prettier-plugin-java": "^2.6.7",
-    "rimraf": "^6.0.1",
-    "rollup": "^4.34.6",
+    "prettier": "^3.6.2",
+    "prettier-plugin-java": "^2.7.7",
+    "prettier-pretty-check": "^0.2.0",
+    "rimraf": "^6.1.0",
+    "rollup": "^4.53.2",
     "swiftlint": "^2.0.0",
-    "typescript": "^5.7.3"
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@capacitor/core": ">=7.0.0"
+    "@capacitor/core": ">=8.0.0"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",