Paywalls: separate PurchasesHybridCommonUI (#858)

Depends on RevenueCat/purchases-hybrid-common#672 See also RevenueCat/purchases-flutter#943 --------- Co-authored-by: RevenueCat CI <dev+ci@revenuecat.com>
RevenueCat · Jan 24, 2024 · ceaa27d · ceaa27d
1 parent fcafeee
commit ceaa27d
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 15 deletions.
diff --git a/RNPurchases.podspec b/RNPurchases.podspec
@@ -20,10 +20,11 @@ Pod::Spec.new do |spec|
   # developers who don't want to use Cocoapods
   spec.exclude_files = [
     "ios/Purchases.framework",
-    "ios/PurchasesHybridCommon.framework"
+    "ios/PurchasesHybridCommon.framework",
+    "ios/PurchasesHybridCommonUI.framework"
   ]
 
   spec.dependency   "React-Core"
-  spec.dependency   "PurchasesHybridCommon", '8.12.0'
+  spec.dependency   "PurchasesHybridCommon", '9.0.0'
   spec.swift_version    = '5.7'
 end
diff --git a/android/build.gradle b/android/build.gradle
@@ -121,6 +121,6 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
     //noinspection GradleDynamicVersion
     api 'com.facebook.react:react-native:+'
-    implementation 'com.revenuecat.purchases:purchases-hybrid-common:8.12.0'
+    implementation 'com.revenuecat.purchases:purchases-hybrid-common:9.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/examples/purchaseTesterTypescript/ios/Podfile b/examples/purchaseTesterTypescript/ios/Podfile
@@ -31,6 +31,7 @@ target 'PurchaseTester' do
 #  pod 'RevenueCat',  :path => '../../../../../purchases-ios/'
 #  pod 'RevenueCatUI',  :path => '../../../../../purchases-ios/'
 #  pod 'PurchasesHybridCommon', :path => '../../../../../purchases-hybrid-common/'
+#  pod 'PurchasesHybridCommonUI', :path => '../../../../../purchases-hybrid-common/'
 
   use_react_native!(
     :path => config[:reactNativePath],

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -11,7 +11,7 @@ files_with_version_number = {
 }
 files_to_update_phc_version = {
     'RNPurchases.podspec' => ['"PurchasesHybridCommon", \'{x}\''],
-    'react-native-purchases-ui/RNPaywalls.podspec' => ['"PurchasesHybridCommon", \'{x}\''],
+    'react-native-purchases-ui/RNPaywalls.podspec' => ['"PurchasesHybridCommon", \'{x}\'', '"PurchasesHybridCommonUI", \'{x}\''],
     'android/build.gradle' => ['com.revenuecat.purchases:purchases-hybrid-common:{x}'],
     'react-native-purchases-ui/android/build.gradle' => ['com.revenuecat.purchases:purchases-hybrid-common-ui:{x}'],
     'package.json' => ['"@revenuecat/purchases-typescript-internal": "{x}"']

diff --git a/package.json b/package.json
@@ -104,6 +104,6 @@
     ]
   },
   "dependencies": {
-    "@revenuecat/purchases-typescript-internal": "8.12.0"
+    "@revenuecat/purchases-typescript-internal": "9.0.0"
   }
 }
diff --git a/react-native-purchases-ui/RNPaywalls.podspec b/react-native-purchases-ui/RNPaywalls.podspec
@@ -17,6 +17,7 @@ Pod::Spec.new do |spec|
   spec.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
 
   spec.dependency   "React-Core"
-  spec.dependency   "PurchasesHybridCommon", '8.12.0'
+  spec.dependency   "PurchasesHybridCommon", '9.0.0'
+  spec.dependency   "PurchasesHybridCommonUI", '9.0.0'
   spec.swift_version    = '5.7'
 end
diff --git a/react-native-purchases-ui/android/build.gradle b/react-native-purchases-ui/android/build.gradle
@@ -91,7 +91,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation 'com.revenuecat.purchases:purchases-hybrid-common-ui:8.12.0'
+  implementation 'com.revenuecat.purchases:purchases-hybrid-common-ui:9.0.0'
   implementation 'androidx.compose.ui:ui-android:1.5.4'
   implementation "androidx.appcompat:appcompat:1.6.1"
 }
diff --git a/react-native-purchases-ui/ios/PaywallViewManager.m b/react-native-purchases-ui/ios/PaywallViewManager.m
@@ -7,7 +7,8 @@
 //
 
 #import "PaywallViewManager.h"
-@import PurchasesHybridCommon;
+
+@import PurchasesHybridCommonUI;
 @import RevenueCatUI;
 
 @implementation PaywallViewManager

diff --git a/react-native-purchases-ui/ios/RCPaywallFooterViewManager.m b/react-native-purchases-ui/ios/RCPaywallFooterViewManager.m
@@ -9,7 +9,7 @@
 #import "RCPaywallFooterViewManager.h"
 
 @import RevenueCatUI;
-@import PurchasesHybridCommon;
+@import PurchasesHybridCommonUI;
 
 #import "UIView+Extensions.h"
 

diff --git a/react-native-purchases-ui/ios/RNPaywalls.h b/react-native-purchases-ui/ios/RNPaywalls.h
@@ -5,7 +5,7 @@
 
 #import <React/RCTEventEmitter.h>
 
-@import PurchasesHybridCommon;
+@import PurchasesHybridCommonUI;
 @import RevenueCat;
 
 static NSString *const safeAreaInsetsDidChangeEvent = @"safeAreaInsetsDidChange";

diff --git a/yarn.lock b/yarn.lock
@@ -3514,10 +3514,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@revenuecat/purchases-typescript-internal@npm:8.12.0":
-  version: 8.12.0
-  resolution: "@revenuecat/purchases-typescript-internal@npm:8.12.0"
-  checksum: 546b4d9b9d7f3d5042bc1af1c0723e740b6129c75673b8aba21d4096a0d2bfe4c6019db9f4a6334d818a372f061e065b4684abb836ee7642bc57ffec91f51f80
+"@revenuecat/purchases-typescript-internal@npm:9.0.0":
+  version: 9.0.0
+  resolution: "@revenuecat/purchases-typescript-internal@npm:9.0.0"
+  checksum: b67d3ac0de052a3e8e06a08d2074fa67145b47c439e4a0555c65e3aff15f177dff77c08bbe0e01dd6edd0c5523872f3f347a528aedb715124db2b738a82b1d83
   languageName: node
   linkType: hard
 
@@ -12588,7 +12588,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "react-native-purchases@workspace:."
   dependencies:
-    "@revenuecat/purchases-typescript-internal": 8.12.0
+    "@revenuecat/purchases-typescript-internal": 9.0.0
     "@types/jest": ^26.0.0
     "@types/react": ^16.9.19
     "@types/react-native": 0.62.13