Skip to content

Commit 0af95d1

Browse files
bklastaitis-branchbklastaitis-branch
authored
Merge pull request #527 from BranchMetrics/SDK-714/add-plugin-name
SDK-714/add plugin name
2 parents 87bd6ee + 8a2ceb5 commit 0af95d1

File tree

18 files changed

+1464
-1562
lines changed

18 files changed

+1464
-1562
lines changed

‎android/build.gradle‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
apply plugin: 'com.android.library'
22

3+
def getNpmVersion() {
4+
def pluginVersion = "4.2.2"
5+
return pluginVersion
6+
}
7+
38
repositories {
49
mavenCentral()
510
jcenter()
@@ -15,12 +20,15 @@ android {
1520
defaultConfig {
1621
minSdkVersion safeExtGet('minSdkVersion', 16)
1722
targetSdkVersion safeExtGet('targetSdkVersion', 26)
23+
1824
versionCode 1
1925
versionName "1.0"
26+
27+
buildConfigField("String", "RNBRANCH_VERSION", "\"${getNpmVersion()}\"")
2028
}
2129
}
2230

2331
dependencies {
2432
implementation 'com.facebook.react:react-native:+' // From node_modules
25-
api 'io.branch.sdk.android:library:4.2.0'
33+
api 'io.branch.sdk.android:library:4.2.1'
2634
}

‎android/src/main/java/io/branch/rnbranch/RNBranchModule.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import io.branch.referral.BuildConfig;
2222
import io.branch.referral.util.*;
2323
import io.branch.referral.Branch;
24+
import io.branch.referral.BranchUtil;
2425
import io.branch.indexing.*;
2526

2627
import org.json.*;
@@ -94,6 +95,9 @@ public static void getAutoInstance(Context context) {
9495
String testKey = config.getTestKey();
9596
boolean useTest = config.getUseTestInstance();
9697

98+
BranchUtil.setPluginType(BranchUtil.PluginType.ReactNative);
99+
BranchUtil.setPluginVersion(io.branch.rnbranch.BuildConfig.RNBRANCH_VERSION);
100+
97101
if (branchKey != null) {
98102
Branch.getAutoInstance(context, branchKey);
99103
}

‎examples/testbed_native_android/android/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.branch.testbed_native_android">
33
<uses-permission android:name="android.permission.INTERNET"/>
4-
<application android:name=".MainApplication" android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme">
4+
<application android:name=".MainApplication" android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true">
55
<activity android:name=".MainActivity" android:label="@string/app_name" android:theme="@style/Theme.AppCompat.Light.NoActionBar" android:launchMode="singleTask">
66
<intent-filter>
77
<action android:name="android.intent.action.MAIN"/>

‎examples/testbed_native_android/android/app/src/main/java/io/branch/testbed_native_android/MainApplication.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import com.facebook.soloader.SoLoader;
66

7-
import io.branch.referral.Branch;
7+
import io.branch.rnbranch.RNBranchModule;
88

99
/**
1010
* Created by jdee on 3/30/17.
@@ -15,6 +15,6 @@ public class MainApplication extends Application {
1515
public void onCreate() {
1616
super.onCreate();
1717
SoLoader.init(this, false);
18-
Branch.getAutoInstance(this);
18+
RNBranchModule.getAutoInstance(this);
1919
}
2020
}

‎examples/testbed_native_android/package-lock.json‎

Lines changed: 686 additions & 637 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/testbed_native_android/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"react": "16.8.6",
1414
"react-native": "0.60.3",
15-
"react-native-branch": "^4.1.0"
15+
"react-native-branch": "^4.2.1"
1616
},
1717
"devDependencies": {
1818
"@babel/core": "^7.5.4",

‎examples/testbed_native_android/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3626,10 +3626,10 @@ react-is@^16.8.1, react-is@^16.8.4:
36263626
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
36273627
integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
36283628

3629-
react-native-branch@^4.1.0:
3630-
version "4.1.0"
3631-
resolved "https://registry.yarnpkg.com/react-native-branch/-/react-native-branch-4.1.0.tgz#419713610c99aa491a993765b0538d2f17671b46"
3632-
integrity sha512-/gVd0HDEZU/B+vPJpFLnQS/iV3xYU9EAVnYTT+ao+yVgjiWfNXeP4O9aECc0OQACsgWxAOjA19tDQxzohjhTmg==
3629+
react-native-branch@^4.2.1:
3630+
version "4.2.1"
3631+
resolved "https://registry.yarnpkg.com/react-native-branch/-/react-native-branch-4.2.1.tgz#3ed1a071c053b420d11af8aa368142b19e2d5129"
3632+
integrity sha512-wwBCsj3VslS0zG8UAZjx+nNrWgd3CuA24r5muFDzS38oQ4S9oB0NJPafEcWcUT7TPxw/rfpdPLb+JccGvS2/Lg==
36333633

36343634
react-native@0.60.3:
36353635
version "0.60.3"

‎examples/testbed_native_ios/ios/Podfile.lock‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PODS:
22
- boost-for-react-native (1.63.0)
3-
- Branch (0.27.1):
4-
- Branch/Core (= 0.27.1)
5-
- Branch/Core (0.27.1)
3+
- Branch (0.29.0):
4+
- Branch/Core (= 0.29.0)
5+
- Branch/Core (0.29.0)
66
- DoubleConversion (1.1.6)
77
- Folly (2018.10.22.00):
88
- boost-for-react-native
@@ -60,8 +60,8 @@ PODS:
6060
- React-cxxreact (= 0.60.3)
6161
- React-jsi (= 0.60.3)
6262
- React-jsinspector (0.60.3)
63-
- react-native-branch (4.1.0):
64-
- Branch (= 0.27.1)
63+
- react-native-branch (4.2.1):
64+
- Branch (= 0.29.0)
6565
- React
6666
- React-RCTActionSheet (0.60.3):
6767
- React-Core (= 0.60.3)
@@ -169,7 +169,7 @@ EXTERNAL SOURCES:
169169

170170
SPEC CHECKSUMS:
171171
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
172-
Branch: 1ace77c04b6e3efbf982bf4364f0662bfac156a0
172+
Branch: 6e7421e1f3c0adebdf80008a40a74969b2603cf8
173173
DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
174174
Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
175175
glog: 1f3da668190260b06b429bb211bfbee5cd790c28
@@ -181,7 +181,7 @@ SPEC CHECKSUMS:
181181
React-jsi: c2b6e57836bcae2677a036384111dc2c58e94369
182182
React-jsiexecutor: d9023c5c199114d2b6f38ec861a4d923c73d0735
183183
React-jsinspector: 817b64f3c8a807f09d78620f4f505868d89b26f3
184-
react-native-branch: 861e9210afb3a52317fe4cc6a04086a9250f71b8
184+
react-native-branch: cc611a2d0e7e6c7c4cafebc8e59065b89c38002b
185185
React-RCTActionSheet: 9c42321fd5652515d706dd722c5a10b1970d7ec8
186186
React-RCTAnimation: fabb087dde8964c9a835a7fabd0e7e5701787913
187187
React-RCTBlob: 93f34281d9c9c9e216b25824309eed9fe22a5d41

‎examples/testbed_native_ios/ios/branch.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"delayInitToCheckForSearchAds": true
3+
}

‎examples/testbed_native_ios/ios/testbed_native_ios.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
4A7BC9C323BC13F200DF5871 /* branch.json in Resources */ = {isa = PBXBuildFile; fileRef = 4A7BC9C223BC13F200DF5871 /* branch.json */; };
1011
670B2C96104BC4AAAC53746B /* libPods-testbed_native_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AD34805037249BCBEA51DB6A /* libPods-testbed_native_ios.a */; };
1112
7B63775A1E831BF6009227D1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B6377591E831BF6009227D1 /* main.m */; };
1213
7B63775D1E831BF6009227D1 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B63775C1E831BF6009227D1 /* AppDelegate.m */; };
@@ -20,6 +21,7 @@
2021
/* End PBXBuildFile section */
2122

2223
/* Begin PBXFileReference section */
24+
4A7BC9C223BC13F200DF5871 /* branch.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = branch.json; sourceTree = "<group>"; };
2325
6BB1A7345A739859711A5A68 /* Pods-testbed_native_ios.test-debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-testbed_native_ios.test-debug.xcconfig"; path = "Pods/Target Support Files/Pods-testbed_native_ios/Pods-testbed_native_ios.test-debug.xcconfig"; sourceTree = "<group>"; };
2426
7B6377551E831BF6009227D1 /* testbed_native_ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testbed_native_ios.app; sourceTree = BUILT_PRODUCTS_DIR; };
2527
7B6377591E831BF6009227D1 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -81,6 +83,7 @@
8183
7B63774C1E831BF6009227D1 = {
8284
isa = PBXGroup;
8385
children = (
86+
4A7BC9C223BC13F200DF5871 /* branch.json */,
8487
7B6377571E831BF6009227D1 /* testbed_native_ios */,
8588
7B6377561E831BF6009227D1 /* Products */,
8689
3ABC7CA1AECDC51B364F7312 /* Pods */,
@@ -189,6 +192,7 @@
189192
buildActionMask = 2147483647;
190193
files = (
191194
7B6377681E831BF6009227D1 /* LaunchScreen.storyboard in Resources */,
195+
4A7BC9C323BC13F200DF5871 /* branch.json in Resources */,
192196
7B6377651E831BF6009227D1 /* Assets.xcassets in Resources */,
193197
7B6377631E831BF6009227D1 /* Main.storyboard in Resources */,
194198
);

0 commit comments

Comments
 (0)