From be90be3758562b70753906f5fb08795be7f9c1c9 Mon Sep 17 00:00:00 2001 From: aboedo Date: Thu, 11 Nov 2021 14:28:57 -0300 Subject: [PATCH] Release/4.4.0 (#307) * bump dependencies * updated version number everywhere * added setAirshipChannelID * updated pods * fixed bug in gitignore --- .gitignore | 2 +- CHANGELOG.md | 8 + RNPurchases.podspec | 5 +- VERSIONS.md | 1 + android/build.gradle | 4 +- .../purchases/react/RNPurchasesModule.java | 7 +- dist/purchases.d.ts | 7 + dist/purchases.js | 9 + examples/MagicWeather/ios/Podfile.lock | 24 +- examples/purchaseTester/ios/Podfile.lock | 426 +++++++++--------- .../project.pbxproj | 4 +- ios/RNPurchases.m | 6 +- package.json | 2 +- scripts/build.js | 4 +- src/purchases.ts | 10 + 15 files changed, 282 insertions(+), 237 deletions(-) diff --git a/.gitignore b/.gitignore index e0e30b1b..ed80d63f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ node_modules/ npm-debug.log yarn-error.log -*/yarn.lock +**/yarn.lock # Xcode # diff --git a/CHANGELOG.md b/CHANGELOG.md index 522f4bf0..b39a0d06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 4.4.0 + +- Bump`purchases-hybrid-common` to `1.10.0` [Changelog here](https://github.com/RevenueCat/purchases-hybrid-common/releases/tag/1.10.0) +- Bump `purchases-ios` to `3.13.0` ([Changelog here](https://github.com/RevenueCat/purchases-ios/releases/3.13.0)) +- Bump `purchases-android` to `4.4.0` ([Changelog here](https://github.com/RevenueCat/purchases-android/releases/4.4.0)) +- Added support for Airship integration via `setAirshipChannelID` + https://github.com/RevenueCat/react-native-purchases/pull/307 + ## 4.3.3 - Bump `purchases-ios` to 3.12.8 diff --git a/RNPurchases.podspec b/RNPurchases.podspec index c0574e38..b2dc6c62 100644 --- a/RNPurchases.podspec +++ b/RNPurchases.podspec @@ -16,13 +16,14 @@ Pod::Spec.new do |spec| spec.source_files = "ios/**/*.{h,m,swift}" spec.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } - # Ignore the downloaded Purchases.framework + # Ignore the Purchases.framework that would get downloaded by the download script, meant for + # developers who don't want to use Cocoapods spec.exclude_files = [ "ios/Purchases.framework", "ios/PurchasesHybridCommon.framework" ] spec.dependency "React-Core" - spec.dependency "PurchasesHybridCommon", '1.9.3' + spec.dependency "PurchasesHybridCommon", '1.10.0' spec.swift_version = '5.0' end diff --git a/VERSIONS.md b/VERSIONS.md index b12051b2..0245adad 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -1,5 +1,6 @@ | Version | iOS version | Android version | Common files version | |---------|-------------|-----------------|----------------------| +| 4.4.0 | 3.10.0 | 4.4.0 | 1.10.0 | | 4.3.3 | 3.12.8 | 4.3.3 | 1.9.3 | | 4.3.2 | 3.12.3 | 4.3.1 | 1.9.1 | | 4.3.1 | 3.12.3 | 4.3.1 | 1.9.1 | diff --git a/android/build.gradle b/android/build.gradle index 404b5b4a..01d08648 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -29,7 +29,7 @@ android { minSdkVersion getExtOrIntegerDefault('minSdkVersion') targetSdkVersion getExtOrIntegerDefault('targetSdkVersion') versionCode 1 - versionName '4.3.3' + versionName '4.4.0' } buildTypes { @@ -122,6 +122,6 @@ def kotlin_version = getExtOrDefault('kotlinVersion') dependencies { //noinspection GradleDynamicVersion api 'com.facebook.react:react-native:+' - implementation 'com.revenuecat.purchases:purchases-hybrid-common:1.9.3' + implementation 'com.revenuecat.purchases:purchases-hybrid-common:1.10.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/android/src/main/java/com/revenuecat/purchases/react/RNPurchasesModule.java b/android/src/main/java/com/revenuecat/purchases/react/RNPurchasesModule.java index bbe5f597..a97e5fb3 100644 --- a/android/src/main/java/com/revenuecat/purchases/react/RNPurchasesModule.java +++ b/android/src/main/java/com/revenuecat/purchases/react/RNPurchasesModule.java @@ -43,7 +43,7 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd private static final String PURCHASER_INFO_UPDATED = "Purchases-PurchaserInfoUpdated"; public static final String PLATFORM_NAME = "react-native"; - public static final String PLUGIN_VERSION = "4.3.3"; + public static final String PLUGIN_VERSION = "4.4.0"; private final ReactApplicationContext reactContext; @@ -296,6 +296,11 @@ public void setOnesignalID(String onesignalID) { SubscriberAttributesKt.setOnesignalID(onesignalID); } + @ReactMethod + public void setAirshipChannelID(String airshipChannelID) { + SubscriberAttributesKt.setAirshipChannelID(airshipChannelID); + } + // endregion // region Campaign parameters diff --git a/dist/purchases.d.ts b/dist/purchases.d.ts index 77e9ccd8..a6093824 100644 --- a/dist/purchases.d.ts +++ b/dist/purchases.d.ts @@ -435,6 +435,13 @@ export default class Purchases { * @param onesignalID Empty String or null will delete the subscriber attribute. */ static setOnesignalID(onesignalID: string | null): void; + /** + * Subscriber attribute associated with the Airship Channel Id for the user + * Required for the RevenueCat Airship integration + * + * @param airshipChannelID Empty String or null will delete the subscriber attribute. + */ + static setAirshipChannelID(airshipChannelID: string | null): void; /** * Subscriber attribute associated with the install media source for the user * diff --git a/dist/purchases.js b/dist/purchases.js index 62eeefbb..5fd88638 100644 --- a/dist/purchases.js +++ b/dist/purchases.js @@ -523,6 +523,15 @@ var Purchases = /** @class */ (function () { Purchases.setOnesignalID = function (onesignalID) { RNPurchases.setOnesignalID(onesignalID); }; + /** + * Subscriber attribute associated with the Airship Channel Id for the user + * Required for the RevenueCat Airship integration + * + * @param airshipChannelID Empty String or null will delete the subscriber attribute. + */ + Purchases.setAirshipChannelID = function (airshipChannelID) { + RNPurchases.setAirshipChannelID(airshipChannelID); + }; /** * Subscriber attribute associated with the install media source for the user * diff --git a/examples/MagicWeather/ios/Podfile.lock b/examples/MagicWeather/ios/Podfile.lock index 2e5edda1..cd377c63 100644 --- a/examples/MagicWeather/ios/Podfile.lock +++ b/examples/MagicWeather/ios/Podfile.lock @@ -59,11 +59,11 @@ PODS: - glog (0.3.5) - libevent (2.1.12) - OpenSSL-Universal (1.1.180) - - Purchases (3.12.2): - - PurchasesCoreSwift (= 3.12.2) - - PurchasesCoreSwift (3.12.2) - - PurchasesHybridCommon (1.8.0): - - Purchases (= 3.12.2) + - Purchases (3.12.3): + - PurchasesCoreSwift (= 3.12.3) + - PurchasesCoreSwift (3.12.3) + - PurchasesHybridCommon (1.9.1): + - Purchases (= 3.12.3) - RCT-Folly (2020.01.13.00): - boost-for-react-native - DoubleConversion @@ -327,8 +327,8 @@ PODS: - React - RNGestureHandler (1.9.0): - React-Core - - RNPurchases (5.0.0-amazon.alpha.1): - - PurchasesHybridCommon (= 1.8.0) + - RNPurchases (4.3.1): + - PurchasesHybridCommon (= 1.9.1) - React-Core - RNReanimated (1.13.2): - React-Core @@ -493,7 +493,7 @@ SPEC CHECKSUMS: CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b - FBReactNativeSpec: 689b64d33514160d4359f9a7be7a16f6992d0405 + FBReactNativeSpec: 793223d9e1d49b41629f98d80dc45853f7c64b12 Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c @@ -504,9 +504,9 @@ SPEC CHECKSUMS: glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b - Purchases: 3e20881892483ab6ca17cb86a89af4c6d1731562 - PurchasesCoreSwift: e614645840af49d465dee1918011f784365d79a6 - PurchasesHybridCommon: f87cfd2fb1a55df8daa2a996a1d19d48e5bfbf4f + Purchases: e9839517aea4335136f3946ae228eecf5131cc25 + PurchasesCoreSwift: dd3fd55a9895abd7906a3842bd36c7f7539a99d1 + PurchasesHybridCommon: 1d98dd58935a4fa1009c6e17f8b740973147b899 RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c RCTRequired: 6d3e854f0e7260a648badd0d44fc364bc9da9728 RCTTypeSafety: c1f31d19349c6b53085766359caac425926fafaa @@ -533,7 +533,7 @@ SPEC CHECKSUMS: ReactCommon: 149906e01aa51142707a10665185db879898e966 RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f RNGestureHandler: 9b7e605a741412e20e13c512738a31bd1611759b - RNPurchases: e2776ca25a67deeb802b55096e8aea75c413944a + RNPurchases: ef07f897760dd7639c36281a05e1ddbf30abc9f5 RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad RNScreens: b6c9607e6fe47c1b6e2f1910d2acd46dd7ecea3a RNVectorIcons: f67a1abce2ec73e62fe4606e8110e95a832bc859 diff --git a/examples/purchaseTester/ios/Podfile.lock b/examples/purchaseTester/ios/Podfile.lock index 76b9c73f..b08b1251 100644 --- a/examples/purchaseTester/ios/Podfile.lock +++ b/examples/purchaseTester/ios/Podfile.lock @@ -2,14 +2,14 @@ PODS: - boost-for-react-native (1.63.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.64.2) - - FBReactNativeSpec (0.64.2): + - FBLazyVector (0.64.3) + - FBReactNativeSpec (0.64.3): - RCT-Folly (= 2020.01.13.00) - - RCTRequired (= 0.64.2) - - RCTTypeSafety (= 0.64.2) - - React-Core (= 0.64.2) - - React-jsi (= 0.64.2) - - ReactCommon/turbomodule/core (= 0.64.2) + - RCTRequired (= 0.64.3) + - RCTTypeSafety (= 0.64.3) + - React-Core (= 0.64.3) + - React-jsi (= 0.64.3) + - ReactCommon/turbomodule/core (= 0.64.3) - Flipper (0.75.1): - Flipper-Folly (~> 2.5) - Flipper-RSocket (~> 1.3) @@ -59,11 +59,11 @@ PODS: - glog (0.3.5) - libevent (2.1.12) - OpenSSL-Universal (1.1.180) - - Purchases (3.12.8): - - PurchasesCoreSwift (= 3.12.8) - - PurchasesCoreSwift (3.12.8) - - PurchasesHybridCommon (1.9.3): - - Purchases (= 3.12.8) + - Purchases (3.13.0): + - PurchasesCoreSwift (= 3.13.0) + - PurchasesCoreSwift (3.13.0) + - PurchasesHybridCommon (1.10.0): + - Purchases (= 3.13.0) - RCT-Folly (2020.01.13.00): - boost-for-react-native - DoubleConversion @@ -73,258 +73,258 @@ PODS: - boost-for-react-native - DoubleConversion - glog - - RCTRequired (0.64.2) - - RCTTypeSafety (0.64.2): - - FBLazyVector (= 0.64.2) + - RCTRequired (0.64.3) + - RCTTypeSafety (0.64.3): + - FBLazyVector (= 0.64.3) - RCT-Folly (= 2020.01.13.00) - - RCTRequired (= 0.64.2) - - React-Core (= 0.64.2) - - React (0.64.2): - - React-Core (= 0.64.2) - - React-Core/DevSupport (= 0.64.2) - - React-Core/RCTWebSocket (= 0.64.2) - - React-RCTActionSheet (= 0.64.2) - - React-RCTAnimation (= 0.64.2) - - React-RCTBlob (= 0.64.2) - - React-RCTImage (= 0.64.2) - - React-RCTLinking (= 0.64.2) - - React-RCTNetwork (= 0.64.2) - - React-RCTSettings (= 0.64.2) - - React-RCTText (= 0.64.2) - - React-RCTVibration (= 0.64.2) - - React-callinvoker (0.64.2) - - React-Core (0.64.2): + - RCTRequired (= 0.64.3) + - React-Core (= 0.64.3) + - React (0.64.3): + - React-Core (= 0.64.3) + - React-Core/DevSupport (= 0.64.3) + - React-Core/RCTWebSocket (= 0.64.3) + - React-RCTActionSheet (= 0.64.3) + - React-RCTAnimation (= 0.64.3) + - React-RCTBlob (= 0.64.3) + - React-RCTImage (= 0.64.3) + - React-RCTLinking (= 0.64.3) + - React-RCTNetwork (= 0.64.3) + - React-RCTSettings (= 0.64.3) + - React-RCTText (= 0.64.3) + - React-RCTVibration (= 0.64.3) + - React-callinvoker (0.64.3) + - React-Core (0.64.3): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.64.2) - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-Core/Default (= 0.64.3) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsiexecutor (= 0.64.3) + - React-perflogger (= 0.64.3) - Yoga - - React-Core/CoreModulesHeaders (0.64.2): + - React-Core/CoreModulesHeaders (0.64.3): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsiexecutor (= 0.64.3) + - React-perflogger (= 0.64.3) - Yoga - - React-Core/Default (0.64.2): + - React-Core/Default (0.64.3): - glog - RCT-Folly (= 2020.01.13.00) - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsiexecutor (= 0.64.3) + - React-perflogger (= 0.64.3) - Yoga - - React-Core/DevSupport (0.64.2): + - React-Core/DevSupport (0.64.3): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.64.2) - - React-Core/RCTWebSocket (= 0.64.2) - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-jsinspector (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-Core/Default (= 0.64.3) + - React-Core/RCTWebSocket (= 0.64.3) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsiexecutor (= 0.64.3) + - React-jsinspector (= 0.64.3) + - React-perflogger (= 0.64.3) - Yoga - - React-Core/RCTActionSheetHeaders (0.64.2): + - React-Core/RCTActionSheetHeaders (0.64.3): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsiexecutor (= 0.64.3) + - React-perflogger (= 0.64.3) - Yoga - - React-Core/RCTAnimationHeaders (0.64.2): + - React-Core/RCTAnimationHeaders (0.64.3): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsiexecutor (= 0.64.3) + - React-perflogger (= 0.64.3) - Yoga - - React-Core/RCTBlobHeaders (0.64.2): + - React-Core/RCTBlobHeaders (0.64.3): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsiexecutor (= 0.64.3) + - React-perflogger (= 0.64.3) - Yoga - - React-Core/RCTImageHeaders (0.64.2): + - React-Core/RCTImageHeaders (0.64.3): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsiexecutor (= 0.64.3) + - React-perflogger (= 0.64.3) - Yoga - - React-Core/RCTLinkingHeaders (0.64.2): + - React-Core/RCTLinkingHeaders (0.64.3): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsiexecutor (= 0.64.3) + - React-perflogger (= 0.64.3) - Yoga - - React-Core/RCTNetworkHeaders (0.64.2): + - React-Core/RCTNetworkHeaders (0.64.3): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsiexecutor (= 0.64.3) + - React-perflogger (= 0.64.3) - Yoga - - React-Core/RCTSettingsHeaders (0.64.2): + - React-Core/RCTSettingsHeaders (0.64.3): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsiexecutor (= 0.64.3) + - React-perflogger (= 0.64.3) - Yoga - - React-Core/RCTTextHeaders (0.64.2): + - React-Core/RCTTextHeaders (0.64.3): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsiexecutor (= 0.64.3) + - React-perflogger (= 0.64.3) - Yoga - - React-Core/RCTVibrationHeaders (0.64.2): + - React-Core/RCTVibrationHeaders (0.64.3): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsiexecutor (= 0.64.3) + - React-perflogger (= 0.64.3) - Yoga - - React-Core/RCTWebSocket (0.64.2): + - React-Core/RCTWebSocket (0.64.3): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.64.2) - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-Core/Default (= 0.64.3) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsiexecutor (= 0.64.3) + - React-perflogger (= 0.64.3) - Yoga - - React-CoreModules (0.64.2): - - FBReactNativeSpec (= 0.64.2) + - React-CoreModules (0.64.3): + - FBReactNativeSpec (= 0.64.3) - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.64.2) - - React-Core/CoreModulesHeaders (= 0.64.2) - - React-jsi (= 0.64.2) - - React-RCTImage (= 0.64.2) - - ReactCommon/turbomodule/core (= 0.64.2) - - React-cxxreact (0.64.2): + - RCTTypeSafety (= 0.64.3) + - React-Core/CoreModulesHeaders (= 0.64.3) + - React-jsi (= 0.64.3) + - React-RCTImage (= 0.64.3) + - ReactCommon/turbomodule/core (= 0.64.3) + - React-cxxreact (0.64.3): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsinspector (= 0.64.2) - - React-perflogger (= 0.64.2) - - React-runtimeexecutor (= 0.64.2) - - React-jsi (0.64.2): + - React-callinvoker (= 0.64.3) + - React-jsi (= 0.64.3) + - React-jsinspector (= 0.64.3) + - React-perflogger (= 0.64.3) + - React-runtimeexecutor (= 0.64.3) + - React-jsi (0.64.3): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-jsi/Default (= 0.64.2) - - React-jsi/Default (0.64.2): + - React-jsi/Default (= 0.64.3) + - React-jsi/Default (0.64.3): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-jsiexecutor (0.64.2): + - React-jsiexecutor (0.64.3): - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-perflogger (= 0.64.2) - - React-jsinspector (0.64.2) - - React-perflogger (0.64.2) - - React-RCTActionSheet (0.64.2): - - React-Core/RCTActionSheetHeaders (= 0.64.2) - - React-RCTAnimation (0.64.2): - - FBReactNativeSpec (= 0.64.2) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-perflogger (= 0.64.3) + - React-jsinspector (0.64.3) + - React-perflogger (0.64.3) + - React-RCTActionSheet (0.64.3): + - React-Core/RCTActionSheetHeaders (= 0.64.3) + - React-RCTAnimation (0.64.3): + - FBReactNativeSpec (= 0.64.3) - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.64.2) - - React-Core/RCTAnimationHeaders (= 0.64.2) - - React-jsi (= 0.64.2) - - ReactCommon/turbomodule/core (= 0.64.2) - - React-RCTBlob (0.64.2): - - FBReactNativeSpec (= 0.64.2) + - RCTTypeSafety (= 0.64.3) + - React-Core/RCTAnimationHeaders (= 0.64.3) + - React-jsi (= 0.64.3) + - ReactCommon/turbomodule/core (= 0.64.3) + - React-RCTBlob (0.64.3): + - FBReactNativeSpec (= 0.64.3) - RCT-Folly (= 2020.01.13.00) - - React-Core/RCTBlobHeaders (= 0.64.2) - - React-Core/RCTWebSocket (= 0.64.2) - - React-jsi (= 0.64.2) - - React-RCTNetwork (= 0.64.2) - - ReactCommon/turbomodule/core (= 0.64.2) - - React-RCTImage (0.64.2): - - FBReactNativeSpec (= 0.64.2) + - React-Core/RCTBlobHeaders (= 0.64.3) + - React-Core/RCTWebSocket (= 0.64.3) + - React-jsi (= 0.64.3) + - React-RCTNetwork (= 0.64.3) + - ReactCommon/turbomodule/core (= 0.64.3) + - React-RCTImage (0.64.3): + - FBReactNativeSpec (= 0.64.3) - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.64.2) - - React-Core/RCTImageHeaders (= 0.64.2) - - React-jsi (= 0.64.2) - - React-RCTNetwork (= 0.64.2) - - ReactCommon/turbomodule/core (= 0.64.2) - - React-RCTLinking (0.64.2): - - FBReactNativeSpec (= 0.64.2) - - React-Core/RCTLinkingHeaders (= 0.64.2) - - React-jsi (= 0.64.2) - - ReactCommon/turbomodule/core (= 0.64.2) - - React-RCTNetwork (0.64.2): - - FBReactNativeSpec (= 0.64.2) + - RCTTypeSafety (= 0.64.3) + - React-Core/RCTImageHeaders (= 0.64.3) + - React-jsi (= 0.64.3) + - React-RCTNetwork (= 0.64.3) + - ReactCommon/turbomodule/core (= 0.64.3) + - React-RCTLinking (0.64.3): + - FBReactNativeSpec (= 0.64.3) + - React-Core/RCTLinkingHeaders (= 0.64.3) + - React-jsi (= 0.64.3) + - ReactCommon/turbomodule/core (= 0.64.3) + - React-RCTNetwork (0.64.3): + - FBReactNativeSpec (= 0.64.3) - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.64.2) - - React-Core/RCTNetworkHeaders (= 0.64.2) - - React-jsi (= 0.64.2) - - ReactCommon/turbomodule/core (= 0.64.2) - - React-RCTSettings (0.64.2): - - FBReactNativeSpec (= 0.64.2) + - RCTTypeSafety (= 0.64.3) + - React-Core/RCTNetworkHeaders (= 0.64.3) + - React-jsi (= 0.64.3) + - ReactCommon/turbomodule/core (= 0.64.3) + - React-RCTSettings (0.64.3): + - FBReactNativeSpec (= 0.64.3) - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.64.2) - - React-Core/RCTSettingsHeaders (= 0.64.2) - - React-jsi (= 0.64.2) - - ReactCommon/turbomodule/core (= 0.64.2) - - React-RCTText (0.64.2): - - React-Core/RCTTextHeaders (= 0.64.2) - - React-RCTVibration (0.64.2): - - FBReactNativeSpec (= 0.64.2) + - RCTTypeSafety (= 0.64.3) + - React-Core/RCTSettingsHeaders (= 0.64.3) + - React-jsi (= 0.64.3) + - ReactCommon/turbomodule/core (= 0.64.3) + - React-RCTText (0.64.3): + - React-Core/RCTTextHeaders (= 0.64.3) + - React-RCTVibration (0.64.3): + - FBReactNativeSpec (= 0.64.3) - RCT-Folly (= 2020.01.13.00) - - React-Core/RCTVibrationHeaders (= 0.64.2) - - React-jsi (= 0.64.2) - - ReactCommon/turbomodule/core (= 0.64.2) - - React-runtimeexecutor (0.64.2): - - React-jsi (= 0.64.2) - - ReactCommon/turbomodule/core (0.64.2): + - React-Core/RCTVibrationHeaders (= 0.64.3) + - React-jsi (= 0.64.3) + - ReactCommon/turbomodule/core (= 0.64.3) + - React-runtimeexecutor (0.64.3): + - React-jsi (= 0.64.3) + - ReactCommon/turbomodule/core (0.64.3): - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.64.2) - - React-Core (= 0.64.2) - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-perflogger (= 0.64.2) + - React-callinvoker (= 0.64.3) + - React-Core (= 0.64.3) + - React-cxxreact (= 0.64.3) + - React-jsi (= 0.64.3) + - React-perflogger (= 0.64.3) - RNGestureHandler (1.10.3): - React-Core - - RNPurchases (4.3.3): - - PurchasesHybridCommon (= 1.9.3) + - RNPurchases (4.4.0): + - PurchasesHybridCommon (= 1.10.0) - React-Core - RNScreens (2.18.1): - React-Core @@ -472,8 +472,8 @@ SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de - FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b - FBReactNativeSpec: e13ff3c104c78e885051a37c467ad9dabe543fb9 + FBLazyVector: c71c5917ec0ad2de41d5d06a5855f6d5eda06971 + FBReactNativeSpec: bf1a0bd6e1145709fdfc7775605a70b4370f6759 Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c @@ -484,36 +484,36 @@ SPEC CHECKSUMS: glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b - Purchases: 4e410d75f18b544aba8aa41ddc4bffbf8e787246 - PurchasesCoreSwift: 93fa64c1a70e7f493f54aba64e01ff42d1ed9109 - PurchasesHybridCommon: e975934b55c84123501cde4f9e0e015b037a4320 + Purchases: a545d402454bc9395495cceaf0e893360670e0ad + PurchasesCoreSwift: e7f7267a6dc526da226baad19c61e8977fa664b4 + PurchasesHybridCommon: a3282e900a2a05eb6c52acc4c72fb4f931160f5a RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c - RCTRequired: 6d3e854f0e7260a648badd0d44fc364bc9da9728 - RCTTypeSafety: c1f31d19349c6b53085766359caac425926fafaa - React: bda6b6d7ae912de97d7a61aa5c160db24aa2ad69 - React-callinvoker: 9840ea7e8e88ed73d438edb725574820b29b5baa - React-Core: b5e385da7ce5f16a220fc60fd0749eae2c6120f0 - React-CoreModules: 17071a4e2c5239b01585f4aa8070141168ab298f - React-cxxreact: 9be7b6340ed9f7c53e53deca7779f07cd66525ba - React-jsi: 67747b9722f6dab2ffe15b011bcf6b3f2c3f1427 - React-jsiexecutor: 80c46bd381fd06e418e0d4f53672dc1d1945c4c3 - React-jsinspector: cc614ec18a9ca96fd275100c16d74d62ee11f0ae - React-perflogger: 25373e382fed75ce768a443822f07098a15ab737 - React-RCTActionSheet: af7796ba49ffe4ca92e7277a5d992d37203f7da5 - React-RCTAnimation: 6a2e76ab50c6f25b428d81b76a5a45351c4d77aa - React-RCTBlob: 02a2887023e0eed99391b6445b2e23a2a6f9226d - React-RCTImage: ce5bf8e7438f2286d9b646a05d6ab11f38b0323d - React-RCTLinking: ccd20742de14e020cb5f99d5c7e0bf0383aefbd9 - React-RCTNetwork: dfb9d089ab0753e5e5f55fc4b1210858f7245647 - React-RCTSettings: b14aef2d83699e48b410fb7c3ba5b66cd3291ae2 - React-RCTText: 41a2e952dd9adc5caf6fb68ed46b275194d5da5f - React-RCTVibration: 24600e3b1aaa77126989bc58b6747509a1ba14f3 - React-runtimeexecutor: a9904c6d0218fb9f8b19d6dd88607225927668f9 - ReactCommon: 149906e01aa51142707a10665185db879898e966 + RCTRequired: d34bf57e17cb6e3b2681f4809b13843c021feb6c + RCTTypeSafety: 8dab4933124ed39bb0c1d88d74d61b1eb950f28f + React: ef700aeb19afabff83a9cc5799ac955a9c6b5e0f + React-callinvoker: 5547633d44f3e114b17c03c660ccb5faefd9ed2d + React-Core: 3858d60185d71567962468bf176d582e36e4e25b + React-CoreModules: 29b3397adac0c04915cf93089328664868510717 + React-cxxreact: 7e6cc1f4cdfcd40e483dd228fa8a3d3e0ed16f4a + React-jsi: a8b09c29521c798f1783348b37b511ba7b3dbeb3 + React-jsiexecutor: df6abc9fafbecb8e5b7a5fbc5e6d4bd017d594d5 + React-jsinspector: 34e23860273a23695342f58eed3ffd3ba10c31e0 + React-perflogger: cc76a4254d19640f1d8ad1c66fdee800414b805c + React-RCTActionSheet: 7448f049318d8d7e8a9a1ebb742ada721757eea8 + React-RCTAnimation: fb9b3fa1a4a9f5e6ab01b3368693ce69860ba76a + React-RCTBlob: a2e7056601c599c19884992f08ebacae810426f9 + React-RCTImage: 5a46c12327d0d6f6844a1fe38baa92a1e02847e8 + React-RCTLinking: 63dd8305591e1def35267557ed42918aec9eb30b + React-RCTNetwork: d0516e39a5f736b2bff671c3e03804200161dcd3 + React-RCTSettings: a09566b14f1649f6c8a39ad1a174bb5c0631bb09 + React-RCTText: 04a2f0a281f715f0aed4f515717fafd64510e2c8 + React-RCTVibration: c7f845861e79eae13dc1e8217a3cf47a3945b504 + React-runtimeexecutor: 493d9abb8b23c3f84e19ae221eeba92cadcb70dc + ReactCommon: 8fea6422328e2fc093e25c9fac67adbcf0f04fb4 RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 - RNPurchases: 286000464b3584ed106da9360f931de97487ca35 + RNPurchases: 107d8058a35be5cf5f7b4eb6f6de4d76da5c2caa RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d - Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac + Yoga: e6ecf3fa25af9d4c87e94ad7d5d292eedef49749 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: ef0169631a326f7a668fc6ea8da5bdfe60d83f4c diff --git a/examples/purchaseTester/ios/ReactNativeSample.xcodeproj/project.pbxproj b/examples/purchaseTester/ios/ReactNativeSample.xcodeproj/project.pbxproj index dfb38ef0..12f5e28a 100644 --- a/examples/purchaseTester/ios/ReactNativeSample.xcodeproj/project.pbxproj +++ b/examples/purchaseTester/ios/ReactNativeSample.xcodeproj/project.pbxproj @@ -384,7 +384,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 "; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -438,7 +438,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 "; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/ios/RNPurchases.m b/ios/RNPurchases.m index 7b8786c9..8dd528ba 100644 --- a/ios/RNPurchases.m +++ b/ios/RNPurchases.m @@ -283,6 +283,10 @@ - (dispatch_queue_t)methodQueue { [RCCommonFunctionality setOnesignalID:onesignalID]; } +RCT_EXPORT_METHOD(setAirshipChannelID:(NSString *)airshipChannelID) { + [RCCommonFunctionality setAirshipChannelID:airshipChannelID]; +} + # pragma mark Campaign parameters RCT_EXPORT_METHOD(setMediaSource:(NSString *)mediaSource) { @@ -358,7 +362,7 @@ - (NSString *)platformFlavor { } - (NSString *)platformFlavorVersion { - return @"4.3.3"; + return @"4.4.0"; } @end diff --git a/package.json b/package.json index 7d27b152..a243619c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "react-native-purchases", "title": "React Native Purchases", - "version": "4.3.3", + "version": "4.4.0", "description": "React Native in-app purchases and subscriptions made easy. Supports iOS and Android. ", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/scripts/build.js b/scripts/build.js index f89f0ebd..b6f56d70 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -5,11 +5,11 @@ if (os.type() === "Linux") { console.log("Skipping iOS Dependencies"); } else if (os.type() === "Darwin") { const downloadProcess = exec( - "./scripts/download-purchases-framework.sh 3.12.8" + "./scripts/download-purchases-framework.sh 3.13.0" ); downloadProcess.stdout.pipe(process.stdout); const downloadProcessCommon = exec( - "./scripts/download-purchases-common.sh 1.9.3" + "./scripts/download-purchases-common.sh 1.10.0" ); downloadProcessCommon.stdout.pipe(process.stdout); } else if (os.type() === "Windows_NT") { diff --git a/src/purchases.ts b/src/purchases.ts index eb8b131a..841fa1a8 100644 --- a/src/purchases.ts +++ b/src/purchases.ts @@ -744,6 +744,16 @@ export default class Purchases { RNPurchases.setOnesignalID(onesignalID); } + /** + * Subscriber attribute associated with the Airship Channel Id for the user + * Required for the RevenueCat Airship integration + * + * @param airshipChannelID Empty String or null will delete the subscriber attribute. + */ + public static setAirshipChannelID(airshipChannelID: string | null): void { + RNPurchases.setAirshipChannelID(airshipChannelID); + } + /** * Subscriber attribute associated with the install media source for the user *