react-native-purchases 4.6.1 → 5.0.0-beta.3

package/README.md

@@ -23,7 +23,7 @@ React Native Purchases is a client for the [RevenueCat](https://www.revenuecat.c
 
 ## Requirements
 
-The minimum React Native version this SDK requires is `0.58`.
+The minimum React Native version this SDK requires is `0.64`.
 
 ## Installation
 
@@ -53,33 +53,25 @@ pod 'RNPurchases', :path => '../node_modules/react-native-purchases'
 
 In your `ios` folder, run `pod install`. If you've just upgraded ExpoKit, you might need to upgrade cocoapods to the newest version: `sudo gem install cocoapods`. 
 
-#### Manual installation (if your project doesn't use CocoapodsCreate)
+#### Migrating from manual installation (if your project doesn't use CocoapodsCreate)
 
-##### Make a Framework Reference in your project
+##### Remove the Framework Reference from your project
 
-1. Drag `Purchases.framework` and `PurchasesHybridCommon.framework` from the `RNPurchases`sub-project under the libraries section to the outer project and create a reference. 
+1. Remove `Purchases.framework` and `PurchasesHybridCommon.framework` from the libraries section of the project. 
 
-![](https://media.giphy.com/media/W6LvZkQnvc3QnnPza7/giphy.gif)
-
-##### Add iOS Frameworks to Embedded Binaries
+##### Remove iOS Frameworks to Embedded Binaries
 1. In Xcode, in project manager, select your app target.
 1. Select the general tab
-1. Drag `Purchases.framework` and `PurchasesHybridCommon.framework` from your project to the Embedded Binaries section
-
-![](https://media.giphy.com/media/iIdIuEkAzlntxANSiV/giphy.gif)
+1. Look for `Purchases.framework` and `PurchasesHybridCommon.framework` in the Embedded Binaries section and remove them.
 
-Add `$(PROJECT_DIR)/../node_modules/react-native-purchases/ios` to Framework Search paths in build settings
+Remove `$(PROJECT_DIR)/../node_modules/react-native-purchases/ios` from Framework Search paths in build settings
 
-![](https://media.giphy.com/media/1pAbuARm4TLfZKdfx3/giphy.gif)
-
-##### Add Strip Frameworks Phase
-The App Store, in it's infinite wisdom, still rejects fat frameworks, so we need to strip our framework before it is deployed. To do this, add the following script phase to your build.
+##### Remove Strip Frameworks Phase
+During the old manual installation instructions, now deprecated, we indicated to add a build phase to strip fat frameworks. 
 1. In Xcode, in project manager, select your app target.
 2. Open the `Build Phases` tab
-3. Add a new `Run Script`, name it `Strip Frameworks`
-4. Add the following command `"${PROJECT_DIR}/../node_modules/react-native-purchases/ios/strip-frameworks.sh"` (quotes included)
-
-![](https://media.giphy.com/media/39zTmnsW1CIrJNk5AM/giphy.gif)
+3. Remove the added `Strip Frameworks` phase
+4. Clean `Derived Data` 
 
 ##### Link static library
 The `react-native link` command should have added the `libRNPurchases.a` library to the _Linked Frameworks and Libraries_ section of your app target. If it hasn't add it like this:

package/RNPurchases.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |spec|
   spec.authors      = package['author']
   spec.homepage     = "https://github.com/RevenueCat/react-native-purchases"
   spec.license      = package['license']
-  spec.platform     = :ios, "9.0"
+  spec.platform     = :ios, "11.0"
 
   spec.source       = { :git => "https://github.com/RevenueCat/react-native-purchases.git" }
   spec.source_files = "ios/**/*.{h,m,swift}"
@@ -24,6 +24,6 @@ Pod::Spec.new do |spec|
   ]
 
   spec.dependency   "React-Core"
-  spec.dependency   "PurchasesHybridCommon", '2.0.1'
+  spec.dependency   "PurchasesHybridCommon", '4.0.0'
   spec.swift_version    = '5.0'
 end

package/android/build.gradle

@@ -29,7 +29,7 @@ android {
         minSdkVersion getExtOrIntegerDefault('minSdkVersion')
         targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
         versionCode 1
-        versionName '4.6.1'
+        versionName '5.0.0-beta.3'
     }
 
     buildTypes {
@@ -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:2.0.1'
+    implementation 'com.revenuecat.purchases:purchases-hybrid-common:4.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

package/android/build.gradle.bck

@@ -0,0 +1,126 @@
+buildscript {
+    def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['Purchases_kotlinVersion']
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+def getExtOrDefault(name) {
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['Purchases_' + name]
+}
+
+def getExtOrIntegerDefault(name) {
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['Purchases_' + name]).toInteger()
+}
+
+android {
+    compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
+
+    defaultConfig {
+        minSdkVersion getExtOrIntegerDefault('minSdkVersion')
+        targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
+        versionCode 1
+        versionName '5.0.0-beta.2'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    lintOptions {
+        disable 'GradleCompatible'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+repositories {
+    mavenCentral()
+    google()
+
+    def found = false
+    def defaultDir = null
+    def androidSourcesName = 'React Native sources'
+
+    if (rootProject.ext.has('reactNativeAndroidRoot')) {
+        defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
+    } else {
+        defaultDir = new File(
+                projectDir,
+                '/../../../node_modules/react-native/android'
+        )
+    }
+
+    if (defaultDir.exists()) {
+        maven {
+            url defaultDir.toString()
+            name androidSourcesName
+        }
+
+        logger.info(":${project.name}:reactNativeAndroidRoot ${defaultDir.canonicalPath}")
+        found = true
+    } else {
+        def parentDir = rootProject.projectDir
+
+        1.upto(5, {
+            if (found) return true
+            parentDir = parentDir.parentFile
+
+            def androidSourcesDir = new File(
+                    parentDir,
+                    'node_modules/react-native'
+            )
+
+            def androidPrebuiltBinaryDir = new File(
+                    parentDir,
+                    'node_modules/react-native/android'
+            )
+
+            if (androidPrebuiltBinaryDir.exists()) {
+                maven {
+                    url androidPrebuiltBinaryDir.toString()
+                    name androidSourcesName
+                }
+
+                logger.info(":${project.name}:reactNativeAndroidRoot ${androidPrebuiltBinaryDir.canonicalPath}")
+                found = true
+            } else if (androidSourcesDir.exists()) {
+                maven {
+                    url androidSourcesDir.toString()
+                    name androidSourcesName
+                }
+
+                logger.info(":${project.name}:reactNativeAndroidRoot ${androidSourcesDir.canonicalPath}")
+                found = true
+            }
+        })
+    }
+
+    if (!found) {
+        throw new GradleException(
+                "${project.name}: unable to locate React Native android sources. " +
+                        "Ensure you have you installed React Native as a dependency in your project and try again."
+        )
+    }
+}
+
+def kotlin_version = getExtOrDefault('kotlinVersion')
+
+dependencies {
+    //noinspection GradleDynamicVersion
+    api 'com.facebook.react:react-native:+'
+    implementation 'com.revenuecat.purchases:purchases-hybrid-common:4.0.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}

package/android/gradle.properties

@@ -1,5 +1,5 @@
 android.useAndroidX=true
-Purchases_kotlinVersion=1.4.0
+Purchases_kotlinVersion=1.5.31
 Purchases_compileSdkVersion=28
 Purchases_targetSdkVersion=28
 Purchases_minSdkVersion=16

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

@@ -14,8 +14,9 @@ import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.revenuecat.purchases.PurchaserInfo;
+import com.revenuecat.purchases.CustomerInfo;
 import com.revenuecat.purchases.Purchases;
+import com.revenuecat.purchases.Store;
 import com.revenuecat.purchases.common.PlatformInfo;
 import com.revenuecat.purchases.hybridcommon.CommonKt;
 import com.revenuecat.purchases.hybridcommon.ErrorContainer;
@@ -23,9 +24,8 @@ import com.revenuecat.purchases.hybridcommon.OnResult;
 import com.revenuecat.purchases.hybridcommon.OnResultAny;
 import com.revenuecat.purchases.hybridcommon.OnResultList;
 import com.revenuecat.purchases.hybridcommon.SubscriberAttributesKt;
-import com.revenuecat.purchases.hybridcommon.mappers.PurchaserInfoMapperKt;
-import com.revenuecat.purchases.interfaces.UpdatedPurchaserInfoListener;
-import com.revenuecat.purchases.interfaces.Callback;
+import com.revenuecat.purchases.hybridcommon.mappers.CustomerInfoMapperKt;
+import com.revenuecat.purchases.interfaces.UpdatedCustomerInfoListener;
 
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONException;
@@ -39,11 +39,11 @@ import kotlin.UninitializedPropertyAccessException;
 
 import static com.revenuecat.purchases.react.RNPurchasesConverters.convertMapToWriteableMap;
 
-public class RNPurchasesModule extends ReactContextBaseJavaModule implements UpdatedPurchaserInfoListener {
+public class RNPurchasesModule extends ReactContextBaseJavaModule implements UpdatedCustomerInfoListener {
 
-    private static final String PURCHASER_INFO_UPDATED = "Purchases-PurchaserInfoUpdated";
+    private static final String CUSTOMER_INFO_UPDATED = "Purchases-CustomerInfoUpdated";
     public static final String PLATFORM_NAME = "react-native";
-    public static final String PLUGIN_VERSION = "4.6.1";
+    public static final String PLUGIN_VERSION = "4.6.0";
 
     private final ReactApplicationContext reactContext;
 
@@ -79,10 +79,15 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
 
     @ReactMethod
     public void setupPurchases(String apiKey, @Nullable String appUserID,
-                               boolean observerMode, @Nullable String userDefaultsSuiteName) {
+                               boolean observerMode, @Nullable String userDefaultsSuiteName,
+                               @Nullable Boolean usesStoreKit2IfAvailable, boolean useAmazon) {
         PlatformInfo platformInfo = new PlatformInfo(PLATFORM_NAME, PLUGIN_VERSION);
-        CommonKt.configure(reactContext, apiKey, appUserID, observerMode, platformInfo);
-        Purchases.getSharedInstance().setUpdatedPurchaserInfoListener(this);
+        Store store = Store.PLAY_STORE;
+        if (useAmazon) {
+            store = Store.AMAZON;
+        }
+        CommonKt.configure(reactContext, apiKey, appUserID, observerMode, platformInfo, store);
+        Purchases.getSharedInstance().setUpdatedCustomerInfoListener(this);
     }
 
     @ReactMethod
@@ -90,15 +95,6 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
         CommonKt.setAllowSharingAppStoreAccount(allowSharingStoreAccount);
     }
 
-    @ReactMethod
-    public void addAttributionData(ReadableMap data, Integer network, @Nullable String networkUserId) {
-        try {
-            SubscriberAttributesKt.addAttributionData(RNPurchasesConverters.convertReadableMapToJson(data), network, networkUserId);
-        } catch (JSONException e) {
-            Log.e("RNPurchases", "Error parsing attribution date to JSON: " + e.getLocalizedMessage());
-        }
-    }
-
     @ReactMethod
     public void getOfferings(final Promise promise) {
         CommonKt.getOfferings(getOnResult(promise));
@@ -164,8 +160,8 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
     }
 
     @ReactMethod
-    public void restoreTransactions(final Promise promise) {
-        CommonKt.restoreTransactions(getOnResult(promise));
+    public void restorePurchases(final Promise promise) {
+        CommonKt.restorePurchases(getOnResult(promise));
     }
 
     @ReactMethod
@@ -178,29 +174,14 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
         CommonKt.logIn(appUserID, getOnResult(promise));
     }
 
-    @ReactMethod
-    public void reset(final Promise promise) {
-        CommonKt.reset(getOnResult(promise));
-    }
-
-    @ReactMethod
-    public void identify(String appUserID, final Promise promise) {
-        CommonKt.identify(appUserID, getOnResult(promise));
-    }
-
-    @ReactMethod
-    public void createAlias(String newAppUserID, final Promise promise) {
-        CommonKt.createAlias(newAppUserID, getOnResult(promise));
-    }
-
     @ReactMethod
     public void setDebugLogsEnabled(boolean enabled) {
         CommonKt.setDebugLogsEnabled(enabled);
     }
 
     @ReactMethod
-    public void getPurchaserInfo(final Promise promise) {
-        CommonKt.getPurchaserInfo(getOnResult(promise));
+    public void getCustomerInfo(final Promise promise) {
+        CommonKt.getCustomerInfo(getOnResult(promise));
     }
 
     @ReactMethod
@@ -228,15 +209,15 @@ public class RNPurchasesModule extends ReactContextBaseJavaModule implements Upd
     }
 
     @Override
-    public void onReceived(@NonNull PurchaserInfo purchaserInfo) {
+    public void onReceived(@NonNull CustomerInfo customerInfo) {
         reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit(RNPurchasesModule.PURCHASER_INFO_UPDATED,
-                        convertMapToWriteableMap(PurchaserInfoMapperKt.map(purchaserInfo)));
+                .emit(RNPurchasesModule.CUSTOMER_INFO_UPDATED,
+                        convertMapToWriteableMap(CustomerInfoMapperKt.map(customerInfo)));
     }
 
     @ReactMethod
-    public void invalidatePurchaserInfoCache() {
-        CommonKt.invalidatePurchaserInfoCache();
+    public void invalidateCustomerInfoCache() {
+        CommonKt.invalidateCustomerInfoCache();
     }
 
     @ReactMethod