Skip to content

Commit 8455083

Browse files
jdeejdee
authored
Merge pull request #125 from BranchMetrics/gradle-updates
Gradle updates and misc.
2 parents e0cec20 + aee7f90 commit 8455083

File tree

8 files changed

+26
-52
lines changed

8 files changed

+26
-52
lines changed

‎README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,14 @@ Please see the Branch [SDK Integration Guide](https://dev.branch.io/getting-star
5555

5656
## Usage
5757
```js
58-
import branch, { AddToWishlistEvent,
58+
import branch, {
59+
AddToWishlistEvent,
5960
PurchasedEvent,
6061
PurchaseInitiatedEvent,
6162
RegisterViewEvent,
6263
ShareCompletedEvent,
63-
ShareInitiatedEvent } from 'react-native-branch'
64+
ShareInitiatedEvent
65+
} from 'react-native-branch'
6466

6567
// Subscribe to incoming links (both Branch & non-Branch)
6668
// bundle = object with: {params, error, uri}

‎android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ repositories {
77

88
android {
99
compileSdkVersion 23
10-
buildToolsVersion "23.0.1"
10+
buildToolsVersion '25.0.0'
1111

1212
defaultConfig {
1313
minSdkVersion 16
@@ -18,6 +18,6 @@ android {
1818
}
1919

2020
dependencies {
21-
compile 'com.facebook.react:react-native:0.20.+'
21+
compile 'com.facebook.react:react-native:+' // From node_modules
2222
compile 'io.branch.sdk.android:library:2.+'
2323
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,8 @@ public static LinkProperties createLinkProperties(ReadableMap linkPropertiesMap,
335335
private BranchUniversalObject findUniversalObjectOrReject(final String ident, final Promise promise) {
336336
BranchUniversalObject universalObject = mUniversalObjectMap.get(ident);
337337

338-
// This is extremely unlikely and basically a logic error.
339338
if (universalObject == null) {
340-
final String errorMessage = "BranchUniversalObject not found for ident " + ident + ". Do not reuse a BUO after calling release() in JS. Create a new instance instead.";
339+
final String errorMessage = "BranchUniversalObject not found for ident " + ident + ".";
341340
promise.reject(UNIVERSAL_OBJECT_NOT_FOUND_ERROR_CODE, errorMessage);
342341
}
343342

‎ios/RNBranch.m‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,8 @@ - (BranchUniversalObject *)findUniversalObjectWithIdent:(NSString *)ident reject
124124
{
125125
BranchUniversalObject *universalObject = self.universalObjectMap[ident];
126126

127-
// This is extremely unlikely and amounts to a logic error.
128127
if (!universalObject) {
129-
NSString *errorMessage = [NSString stringWithFormat:@"BranchUniversalObject for ident %@ not found. Do not reuse a BUO after calling release() in JS. Create a new instance instead.", ident];
128+
NSString *errorMessage = [NSString stringWithFormat:@"BranchUniversalObject for ident %@ not found.", ident];
130129

131130
NSError *error = [NSError errorWithDomain:RNBranchErrorDomain
132131
code:RNBranchUniversalObjectNotFoundError

‎testbed/testbed_carthage/android/app/app.iml‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,15 @@
7777
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7878
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8081
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
8183
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8284
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8385
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8486
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8587
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8689
</content>
8790
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
8891
<orderEntry type="sourceFolder" forTests="false" />
@@ -93,13 +96,15 @@
9396
<orderEntry type="library" exported="" name="drawee-0.11.0" level="project" />
9497
<orderEntry type="library" exported="" name="jsr305-3.0.0" level="project" />
9598
<orderEntry type="library" exported="" name="bolts-tasks-1.4.0" level="project" />
99+
<orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
96100
<orderEntry type="library" exported="" name="okhttp-urlconnection-3.4.1" level="project" />
97101
<orderEntry type="library" exported="" name="android-jsc-r174650" level="project" />
98102
<orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
99103
<orderEntry type="library" exported="" name="staticlayout-proxy-1.0" level="project" />
100104
<orderEntry type="library" exported="" name="recyclerview-v7-23.4.0" level="project" />
101-
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
105+
<orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
102106
<orderEntry type="library" exported="" name="fbcore-0.11.0" level="project" />
107+
<orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
103108
<orderEntry type="library" exported="" name="imagepipeline-0.11.0" level="project" />
104109
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
105110
<orderEntry type="library" exported="" name="imagepipeline-base-0.11.0" level="project" />
@@ -112,22 +117,5 @@
112117
<orderEntry type="library" exported="" name="imagepipeline-okhttp3-0.11.0" level="project" />
113118
<orderEntry type="library" exported="" name="react-native-0.42.0" level="project" />
114119
<orderEntry type="module" module-name="react-native-branch" exported="" />
115-
<orderEntry type="library" exported="" name="okhttp-ws-2.5.0" level="project" />
116-
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
117-
<orderEntry type="library" exported="" name="stetho-okhttp-1.2.0" level="project" />
118-
<orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
119-
<orderEntry type="library" exported="" name="stetho-1.2.0" level="project" />
120-
<orderEntry type="library" exported="" name="jackson-core-2.2.3" level="project" />
121-
<orderEntry type="library" exported="" name="fbcore-0.8.1" level="project" />
122-
<orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
123-
<orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
124-
<orderEntry type="library" exported="" name="imagepipeline-0.8.1" level="project" />
125-
<orderEntry type="library" exported="" name="fresco-0.8.1" level="project" />
126-
<orderEntry type="library" exported="" name="imagepipeline-okhttp-0.8.1" level="project" />
127-
<orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
128-
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
129-
<orderEntry type="library" exported="" name="drawee-0.8.1" level="project" />
130-
<orderEntry type="library" exported="" name="react-native-0.20.1" level="project" />
131-
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
132120
</component>
133121
</module>

‎testbed/testbed_carthage/android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ android {
127127

128128
dependencies {
129129
compile fileTree(dir: "libs", include: ["*.jar"])
130-
compile "com.android.support:appcompat-v7:23.0.1"
130+
compile "com.android.support:appcompat-v7:23.4.0"
131131
compile "com.facebook.react:react-native:+" // From node_modules
132132
compile project(':react-native-branch')
133133
}

‎testbed/testbed_cocoapods/android/app/app.iml‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,43 +62,27 @@
6262
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6363
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7265
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7467
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7871
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8079
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8380
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
9382
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
9583
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
9884
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
10085
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
10286
</content>
10387
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
10488
<orderEntry type="sourceFolder" forTests="false" />
@@ -109,13 +93,15 @@
10993
<orderEntry type="library" exported="" name="drawee-0.11.0" level="project" />
11094
<orderEntry type="library" exported="" name="jsr305-3.0.0" level="project" />
11195
<orderEntry type="library" exported="" name="bolts-tasks-1.4.0" level="project" />
96+
<orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
11297
<orderEntry type="library" exported="" name="okhttp-urlconnection-3.4.1" level="project" />
11398
<orderEntry type="library" exported="" name="android-jsc-r174650" level="project" />
11499
<orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
115100
<orderEntry type="library" exported="" name="staticlayout-proxy-1.0" level="project" />
116101
<orderEntry type="library" exported="" name="recyclerview-v7-23.4.0" level="project" />
117-
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
102+
<orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
118103
<orderEntry type="library" exported="" name="fbcore-0.11.0" level="project" />
104+
<orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
119105
<orderEntry type="library" exported="" name="imagepipeline-0.11.0" level="project" />
120106
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
121107
<orderEntry type="library" exported="" name="imagepipeline-base-0.11.0" level="project" />

‎testbed/testbed_cocoapods/android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ android {
122122
dependencies {
123123
compile project(':react-native-branch')
124124
compile fileTree(dir: "libs", include: ["*.jar"])
125-
compile "com.android.support:appcompat-v7:23.0.1"
125+
compile "com.android.support:appcompat-v7:23.4.0"
126126
compile "com.facebook.react:react-native:+" // From node_modules
127127
}
128128

0 commit comments

Comments
 (0)