react-native-purchases 7.4.0-beta.2 → 7.4.0-beta.3

package/RNPurchases.podspec

@@ -24,6 +24,6 @@ Pod::Spec.new do |spec|
   ]
 
   spec.dependency   "React-Core"
-  spec.dependency   "PurchasesHybridCommon", '7.4.0-beta.1'
+  spec.dependency   "PurchasesHybridCommon", '7.4.0-beta.3'
   spec.swift_version    = '5.7'
 end

package/android/build.gradle

@@ -29,7 +29,7 @@ android {
         minSdkVersion getExtOrIntegerDefault('minSdkVersion')
         targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
         versionCode 1
-        versionName '7.4.0-beta.2'
+        versionName '7.4.0-beta.3'
     }
 
     buildTypes {
@@ -121,7 +121,7 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
     //noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
-    implementation 'com.revenuecat.purchases:purchases-hybrid-common:7.4.0-beta.1'
+    implementation 'com.revenuecat.purchases:purchases-hybrid-common:7.4.0-beta.3'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.compose.ui:ui-android:1.5.4'
     implementation "androidx.appcompat:appcompat:1.6.1"

package/android/src/main/java/com/revenuecat/purchases/react/RNPurchasesModule.java

@@ -45,7 +45,7 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
     private static final String CUSTOMER_INFO_UPDATED = "Purchases-CustomerInfoUpdated";
     private static final String LOG_HANDLER_EVENT = "Purchases-LogHandlerEvent";
     public static final String PLATFORM_NAME = "react-native";
-    public static final String PLUGIN_VERSION = "7.4.0-beta.2";
+    public static final String PLUGIN_VERSION = "7.4.0-beta.3";
 
     private final ReactApplicationContext reactContext;
 

package/ios/RNPaywallManager.m

@@ -17,9 +17,9 @@ RCT_EXPORT_MODULE(RNPaywall)
 {
     if (@available(iOS 15.0, *)) {
         PaywallProxy *proxy = [[PaywallProxy alloc] init];
-        return proxy.vc.view;
+        return [proxy createPaywallView].view;
     } else {
-        // TODO: log something
+        NSLog(@"Error: attempted to present paywalls on unsupported iOS version.");
         return nil;
     }
 }

package/ios/RNPaywalls.m

@@ -6,10 +6,44 @@
 
 #import "RNPaywalls.h"
 
+@interface RNPaywalls ()
+
+@property (nonatomic, strong) id paywallProxy;
+
+@end
+
 @implementation RNPaywalls
 
 RCT_EXPORT_MODULE();
 
+- (instancetype)initWithDisabledObservation
+{
+    if ((self = [super initWithDisabledObservation])) {
+        [self initializePaywalls];
+    }
+
+    return self;
+}
+
+- (instancetype)init
+{
+    if (([super init])) {
+        [self initializePaywalls];
+    }
+    return self;
+}
+
+// `RCTEventEmitter` does not implement designated iniitializers correctly so we have to duplicate the call in both constructors.
+- (void)initializePaywalls {
+    if (@available(iOS 15.0, *)) {
+        self.paywallProxy = [PaywallProxy new];
+    } else {
+        self.paywallProxy = nil;
+    }
+}
+
+// MARK: -
+
 - (NSArray<NSString *> *)supportedEvents {
     return @[];
 }
@@ -18,20 +52,30 @@ RCT_EXPORT_MODULE();
     return dispatch_get_main_queue();
 }
 
+- (PaywallProxy *)paywalls API_AVAILABLE(ios(15.0)){
+    return self.paywallProxy;
+}
+
+// MARK: -
+
 RCT_EXPORT_METHOD(presentPaywall) {
     if (@available(iOS 15.0, *)) {
-        [PaywallProxy presentPaywall];
+        [self.paywalls presentPaywall];
     } else {
-        // TODO: log
+        [self logPaywallsUnsupportedError];
     }
 }
 
 RCT_EXPORT_METHOD(presentPaywallIfNeeded:(NSString *)requiredEntitlementIdentifier) {
     if (@available(iOS 15.0, *)) {
-        [PaywallProxy presentPaywallIfNeededWithRequiredEntitlementIdentifier:requiredEntitlementIdentifier];
+        [self.paywalls presentPaywallIfNeededWithRequiredEntitlementIdentifier:requiredEntitlementIdentifier];
     } else {
-        // TODO: log
+        [self logPaywallsUnsupportedError];
     }
 }
 
+- (void)logPaywallsUnsupportedError {
+    NSLog(@"Error: attempted to present paywalls on unsupported iOS version.");
+}
+
 @end

package/ios/RNPurchases.m

@@ -470,7 +470,7 @@ readyForPromotedProduct:(RCStoreProduct *)product
 }
 
 - (NSString *)platformFlavorVersion {
-    return @"7.4.0-beta.2";
+    return @"7.4.0-beta.3";
 }
 
 @end

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-purchases",
   "title": "React Native Purchases",
-  "version": "7.4.0-beta.2",
+  "version": "7.4.0-beta.3",
   "description": "React Native in-app purchases and subscriptions made easy. Supports iOS and Android. ",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/scripts/docs/index.html

@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<meta http-equiv="refresh" content="0; url=https://revenuecat.github.io/react-native-purchases-docs/7.4.0-beta.2/" />
+	<meta http-equiv="refresh" content="0; url=https://revenuecat.github.io/react-native-purchases-docs/7.4.0-beta.3/" />
 </head>
 <body>
 </body>