Merge pull request #562 from BranchMetrics/SDK-929_update-native-sdks…

…-3.x [SDK-929] Update native sdks (3.x)
BranchMetrics · Mar 31, 2020 · d14f824 · d14f824
2 parents ba462e5 + 1ba47d7
commit d14f824
Show file tree

Hide file tree

Showing 15 changed files with 51 additions and 275 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,3 +49,6 @@ android/build
 .idea
 
 Pods
+
+# Because of bundler 1.x/2.x issues
+Gemfile.lock
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,8 @@ cache: yarn
 
 install:
 # Set up RVM, RubyGems, Bundler
-  - rvm install 2.4.3
-  - rvm use 2.4.3 --default
+  - rvm install 2.6
+  - rvm use 2.6 --default
   - gem update --system
   - gem install bundler
   - bundle check || bundle install

diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,4 +1,11 @@
 apply plugin: 'com.android.library'
+import groovy.json.JsonSlurper
+
+def getNpmVersion() {
+    def packageJsonFile = file('../package.json')
+    def packageJson = new JsonSlurper().parseText(packageJsonFile.text)
+    return packageJson.version
+}
 
 repositories {
     mavenCentral()
@@ -17,10 +24,12 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', 26)
         versionCode 1
         versionName "1.0"
+
+        buildConfigField("String", "RNBRANCH_VERSION", "\"${getNpmVersion()}\"")
     }
 }
 
 dependencies {
     implementation 'com.facebook.react:react-native:+' // From node_modules
-    api 'io.branch.sdk.android:library:4.3.2'
+    api 'io.branch.sdk.android:library:5.0.0'
 }
diff --git a/android/src/main/java/io/branch/rnbranch/RNBranchModule.java b/android/src/main/java/io/branch/rnbranch/RNBranchModule.java
@@ -73,6 +73,7 @@ public class RNBranchModule extends ReactContextBaseJavaModule {
     private static final String IDENT_FIELD_NAME = "ident";
     public static final String UNIVERSAL_OBJECT_NOT_FOUND_ERROR_CODE = "RNBranch::Error::BUONotFound";
     private static final long AGING_HASH_TTL = 3600000;
+    private static final String PLUGIN_NAME = "ReactNative";
 
     private static JSONObject initSessionResult = null;
     private BroadcastReceiver mInitSessionEventReceiver = null;
@@ -92,6 +93,8 @@ public static void getAutoInstance(Context context) {
         String testKey = config.getTestKey();
         boolean useTest = config.getUseTestInstance();
 
+        Branch.registerPlugin(PLUGIN_NAME, io.branch.rnbranch.BuildConfig.RNBRANCH_VERSION);
+
         if (branchKey != null) {
             Branch.getAutoInstance(context, branchKey);
         }

diff --git a/examples/browser_example/android/app/src/main/java/com/browser_example/MainApplication.java b/examples/browser_example/android/app/src/main/java/com/browser_example/MainApplication.java
@@ -8,7 +8,7 @@
 import io.branch.rnbranch.RNBranchPackage;
 import com.reactnativecommunity.webview.RNCWebViewPackage;
 
-import io.branch.referral.Branch;
+import io.branch.rnbranch.RNBranchModule;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
@@ -49,7 +49,7 @@ public ReactNativeHost getReactNativeHost() {
   public void onCreate() {
     super.onCreate();
     SoLoader.init(this, /* native exopackage */ false);
-    Branch.getAutoInstance(this);
+    RNBranchModule.getAutoInstance(this);
   }
 
   @Override

diff --git a/...e_android/android/app/src/main/java/io/branch/testbed_native_android/MainApplication.java b/...e_android/android/app/src/main/java/io/branch/testbed_native_android/MainApplication.java
@@ -4,7 +4,7 @@
 import android.support.multidex.MultiDex;
 import android.support.multidex.MultiDexApplication;
 
-import io.branch.referral.Branch;
+import io.branch.rnbranch.RNBranchModule;
 
 /**
  * Created by jdee on 3/30/17.
@@ -14,7 +14,7 @@ public class MainApplication extends MultiDexApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-        Branch.getAutoInstance(this);
+        RNBranchModule.getAutoInstance(this);
     }
 
     @Override

diff --git a/examples/testbed_simple/android/app/src/main/java/com/testbed_simple/MainApplication.java b/examples/testbed_simple/android/app/src/main/java/com/testbed_simple/MainApplication.java
@@ -7,7 +7,7 @@
 import com.facebook.react.ReactApplication;
 import io.branch.rnbranch.RNBranchPackage;
 
-import io.branch.referral.Branch;
+import io.branch.rnbranch.RNBranchModule;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
@@ -47,7 +47,7 @@ public ReactNativeHost getReactNativeHost() {
   public void onCreate() {
     super.onCreate();
     SoLoader.init(this, /* native exopackage */ false);
-    Branch.getAutoInstance(this);
+    RNBranchModule.getAutoInstance(this);
   }
 
   @Override

diff --git a/fastlane/lib/actions/version_bump.rb b/fastlane/lib/actions/version_bump.rb
@@ -14,6 +14,7 @@ def run(params)
           UI.message "Bumping to version #{version}."
 
           update_package_json version
+          update_rnbranch_xcodeproj version
           update_pods_in_tests_and_examples(
             repo_update: params[:repo_update],
             verbose: params[:verbose],