Skip to content

Commit b4116a1

Browse files
jdeejdee
authored
Merge pull request #253 from BranchMetrics/example-updates
More example updates
2 parents 29ed28d + de51846 commit b4116a1

File tree

13 files changed

+2180
-824
lines changed

13 files changed

+2180
-824
lines changed

‎Gemfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ GEM
6868
faraday_middleware (0.12.2)
6969
faraday (>= 0.7.4, < 1.0)
7070
fastimage (2.1.0)
71-
fastlane (2.54.3)
71+
fastlane (2.54.4)
7272
CFPropertyList (>= 2.3, < 3.0.0)
7373
addressable (>= 2.3, < 3.0.0)
7474
babosa (>= 1.0.2, < 2.0.0)
@@ -101,7 +101,7 @@ GEM
101101
xcodeproj (>= 1.5.0, < 2.0.0)
102102
xcpretty (>= 0.2.4, < 1.0.0)
103103
xcpretty-travis-formatter (>= 0.0.3)
104-
fastlane-plugin-branch (0.2.0)
104+
fastlane-plugin-branch (0.2.1)
105105
plist
106106
xcodeproj
107107
fastlane-plugin-patch (0.2.0)

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,9 @@ when `userCompletedAction` is called. There is also a `listOnSpotlight()` method
737737
Object that can be used for this purpose. Note that this method and the
738738
`automaticallyListOnSpotlight` property are ignored on Android.
739739
740+
**Note**: Listing on Spotlight requires adding `CoreSpotlight.framework` to your
741+
Xcode project.
742+
740743
#### Method
741744
742745
```js

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<category android:name='android.intent.category.LAUNCHER'/>
99
</intent-filter>
1010
<!-- Branch intent-filter -->
11-
<intent-filter android:autoverify='true'>
11+
<intent-filter android:autoVerify='true'>
1212
<action android:name='android.intent.action.VIEW'/>
1313
<category android:name='android.intent.category.DEFAULT'/>
1414
<category android:name='android.intent.category.BROWSABLE'/>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
7B6377631E831BF6009227D1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B6377611E831BF6009227D1 /* Main.storyboard */; };
1515
7B6377651E831BF6009227D1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7B6377641E831BF6009227D1 /* Assets.xcassets */; };
1616
7B6377681E831BF6009227D1 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B6377661E831BF6009227D1 /* LaunchScreen.storyboard */; };
17+
7BAA95171F57635B00C57B54 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BAA95161F57635B00C57B54 /* AdSupport.framework */; };
18+
7BAA95191F57636100C57B54 /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BAA95181F57636100C57B54 /* SafariServices.framework */; };
19+
7BAA951B1F57638800C57B54 /* CoreSpotlight.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BAA951A1F57638800C57B54 /* CoreSpotlight.framework */; };
1720
/* End PBXBuildFile section */
1821

1922
/* Begin PBXFileReference section */
@@ -29,6 +32,9 @@
2932
7B6377671E831BF6009227D1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
3033
7B6377691E831BF6009227D1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3134
7B6377961E833F57009227D1 /* testbed_native_ios.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = testbed_native_ios.entitlements; sourceTree = "<group>"; };
35+
7BAA95161F57635B00C57B54 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
36+
7BAA95181F57636100C57B54 /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = System/Library/Frameworks/SafariServices.framework; sourceTree = SDKROOT; };
37+
7BAA951A1F57638800C57B54 /* CoreSpotlight.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreSpotlight.framework; path = System/Library/Frameworks/CoreSpotlight.framework; sourceTree = SDKROOT; };
3238
8E214B899E1861D89268F2CE /* Pods-testbed_native_ios.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-testbed_native_ios.debug.xcconfig"; path = "Pods/Target Support Files/Pods-testbed_native_ios/Pods-testbed_native_ios.debug.xcconfig"; sourceTree = "<group>"; };
3339
AD34805037249BCBEA51DB6A /* libPods-testbed_native_ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-testbed_native_ios.a"; sourceTree = BUILT_PRODUCTS_DIR; };
3440
F7AE53FD155ABDCFC1404DD7 /* Pods-testbed_native_ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-testbed_native_ios.release.xcconfig"; path = "Pods/Target Support Files/Pods-testbed_native_ios/Pods-testbed_native_ios.release.xcconfig"; sourceTree = "<group>"; };
@@ -40,6 +46,9 @@
4046
isa = PBXFrameworksBuildPhase;
4147
buildActionMask = 2147483647;
4248
files = (
49+
7BAA951B1F57638800C57B54 /* CoreSpotlight.framework in Frameworks */,
50+
7BAA95191F57636100C57B54 /* SafariServices.framework in Frameworks */,
51+
7BAA95171F57635B00C57B54 /* AdSupport.framework in Frameworks */,
4352
670B2C96104BC4AAAC53746B /* libPods-testbed_native_ios.a in Frameworks */,
4453
);
4554
runOnlyForDeploymentPostprocessing = 0;
@@ -61,6 +70,9 @@
6170
62D952F86D5117E8991C0B89 /* Frameworks */ = {
6271
isa = PBXGroup;
6372
children = (
73+
7BAA951A1F57638800C57B54 /* CoreSpotlight.framework */,
74+
7BAA95181F57636100C57B54 /* SafariServices.framework */,
75+
7BAA95161F57635B00C57B54 /* AdSupport.framework */,
6476
AD34805037249BCBEA51DB6A /* libPods-testbed_native_ios.a */,
6577
);
6678
name = Frameworks;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<category android:name='android.intent.category.LAUNCHER'/>
1010
</intent-filter>
1111
<!-- Branch intent-filter -->
12-
<intent-filter android:autoverify='true'>
12+
<intent-filter android:autoVerify='true'>
1313
<action android:name='android.intent.action.VIEW'/>
1414
<category android:name='android.intent.category.DEFAULT'/>
1515
<category android:name='android.intent.category.BROWSABLE'/>

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

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
};
66
objectVersion = 46;
77
objects = {
8+
89
/* Begin PBXBuildFile section */
910
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
1011
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
@@ -34,9 +35,12 @@
3435
2D02E4C91E0B4AEC006451C7 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
3536
2DCD954D1E0B4F2C00145EB5 /* testbed_simpleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* testbed_simpleTests.m */; };
3637
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
38+
7141121E60934D2AB530397F /* branch.debug.json in Resources */ = {isa = PBXBuildFile; fileRef = 73442802FDB3416893862491 /* branch.debug.json */; };
39+
7BAA95131F57634200C57B54 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BAA95121F57634200C57B54 /* AdSupport.framework */; };
40+
7BAA95151F57634800C57B54 /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BAA95141F57634800C57B54 /* SafariServices.framework */; };
41+
7BAA95291F57639400C57B54 /* CoreSpotlight.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BAA95281F57639400C57B54 /* CoreSpotlight.framework */; };
3742
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
3843
D9ED2727DA264331959EEF70 /* libreact-native-branch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BB4222F61210465898829C17 /* libreact-native-branch.a */; };
39-
7141121E60934D2AB530397F /* branch.debug.json in Resources */ = {isa = PBXBuildFile; fileRef = 73442802FDB3416893862491 /* branch.debug.json */; };
4044
/* End PBXBuildFile section */
4145

4246
/* Begin PBXContainerItemProxy section */
@@ -222,6 +226,13 @@
222226
remoteGlobalIDString = 134814201AA4EA6300B7C361;
223227
remoteInfo = RCTLinking;
224228
};
229+
7BAA948E1F575D1200C57B54 /* PBXContainerItemProxy */ = {
230+
isa = PBXContainerItemProxy;
231+
containerPortal = 833C26E28CFB41BB8628EAD0 /* RNBranch.xcodeproj */;
232+
proxyType = 2;
233+
remoteGlobalIDString = B3A3CC361C5B0A070016AC52;
234+
remoteInfo = RNBranch;
235+
};
225236
832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */ = {
226237
isa = PBXContainerItemProxy;
227238
containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
@@ -254,12 +265,15 @@
254265
2D02E47B1E0B4A5D006451C7 /* testbed_simple-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "testbed_simple-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
255266
2D02E4901E0B4A5D006451C7 /* testbed_simple-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "testbed_simple-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
256267
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
268+
73442802FDB3416893862491 /* branch.debug.json */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = branch.debug.json; path = ../branch.debug.json; sourceTree = "<group>"; };
257269
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
258270
7B9654521E96E27C009C3CEE /* testbed_simple.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = testbed_simple.entitlements; path = testbed_simple/testbed_simple.entitlements; sourceTree = "<group>"; };
271+
7BAA95121F57634200C57B54 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
272+
7BAA95141F57634800C57B54 /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = System/Library/Frameworks/SafariServices.framework; sourceTree = SDKROOT; };
273+
7BAA95281F57639400C57B54 /* CoreSpotlight.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreSpotlight.framework; path = System/Library/Frameworks/CoreSpotlight.framework; sourceTree = SDKROOT; };
259274
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
260-
833C26E28CFB41BB8628EAD0 /* RNBranch.xcodeproj */ = {isa = PBXFileReference; name = "RNBranch.xcodeproj"; path = "../node_modules/react-native-branch/ios/RNBranch.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
261-
BB4222F61210465898829C17 /* libreact-native-branch.a */ = {isa = PBXFileReference; name = "libreact-native-branch.a"; path = "libreact-native-branch.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
262-
73442802FDB3416893862491 /* branch.debug.json */ = {isa = PBXFileReference; name = "branch.debug.json"; path = "../branch.debug.json"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
275+
833C26E28CFB41BB8628EAD0 /* RNBranch.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNBranch.xcodeproj; path = "../node_modules/react-native-branch/ios/RNBranch.xcodeproj"; sourceTree = "<group>"; };
276+
BB4222F61210465898829C17 /* libreact-native-branch.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libreact-native-branch.a"; sourceTree = "<group>"; };
263277
/* End PBXFileReference section */
264278

265279
/* Begin PBXFrameworksBuildPhase section */
@@ -275,6 +289,9 @@
275289
isa = PBXFrameworksBuildPhase;
276290
buildActionMask = 2147483647;
277291
files = (
292+
7BAA95291F57639400C57B54 /* CoreSpotlight.framework in Frameworks */,
293+
7BAA95151F57634800C57B54 /* SafariServices.framework in Frameworks */,
294+
7BAA95131F57634200C57B54 /* AdSupport.framework in Frameworks */,
278295
146834051AC3E58100842450 /* libReact.a in Frameworks */,
279296
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
280297
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
@@ -441,6 +458,24 @@
441458
name = Products;
442459
sourceTree = "<group>";
443460
};
461+
7BAA94721F575D1200C57B54 /* Products */ = {
462+
isa = PBXGroup;
463+
children = (
464+
7BAA948F1F575D1200C57B54 /* libreact-native-branch.a */,
465+
);
466+
name = Products;
467+
sourceTree = "<group>";
468+
};
469+
7BAA95111F57634200C57B54 /* Frameworks */ = {
470+
isa = PBXGroup;
471+
children = (
472+
7BAA95281F57639400C57B54 /* CoreSpotlight.framework */,
473+
7BAA95141F57634800C57B54 /* SafariServices.framework */,
474+
7BAA95121F57634200C57B54 /* AdSupport.framework */,
475+
);
476+
name = Frameworks;
477+
sourceTree = "<group>";
478+
};
444479
832341AE1AAA6A7D00B99B32 /* Libraries */ = {
445480
isa = PBXGroup;
446481
children = (
@@ -476,6 +511,7 @@
476511
832341AE1AAA6A7D00B99B32 /* Libraries */,
477512
00E356EF1AD99517003FC87E /* testbed_simpleTests */,
478513
83CBBA001A601CBA00E9B192 /* Products */,
514+
7BAA95111F57634200C57B54 /* Frameworks */,
479515
);
480516
indentWidth = 2;
481517
sourceTree = "<group>";
@@ -578,6 +614,7 @@
578614
TargetAttributes = {
579615
00E356ED1AD99517003FC87E = {
580616
CreatedOnToolsVersion = 6.2;
617+
DevelopmentTeam = R63EM248DP;
581618
TestTargetID = 13B07F861A680F5B00A75B9A;
582619
};
583620
13B07F861A680F5B00A75B9A = {
@@ -655,6 +692,10 @@
655692
ProductGroup = 146834001AC3E56700842450 /* Products */;
656693
ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
657694
},
695+
{
696+
ProductGroup = 7BAA94721F575D1200C57B54 /* Products */;
697+
ProjectRef = 833C26E28CFB41BB8628EAD0 /* RNBranch.xcodeproj */;
698+
},
658699
);
659700
projectRoot = "";
660701
targets = (
@@ -835,11 +876,11 @@
835876
remoteRef = 78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */;
836877
sourceTree = BUILT_PRODUCTS_DIR;
837878
};
838-
7B635E601EF35571008B5664 /* libreact-native-branch.a */ = {
879+
7BAA948F1F575D1200C57B54 /* libreact-native-branch.a */ = {
839880
isa = PBXReferenceProxy;
840881
fileType = archive.ar;
841882
path = "libreact-native-branch.a";
842-
remoteRef = 7B635E5F1EF35571008B5664 /* PBXContainerItemProxy */;
883+
remoteRef = 7BAA948E1F575D1200C57B54 /* PBXContainerItemProxy */;
843884
sourceTree = BUILT_PRODUCTS_DIR;
844885
};
845886
832341B51AAA6A8300B99B32 /* libRCTText.a */ = {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<category android:name='android.intent.category.LAUNCHER'/>
1010
</intent-filter>
1111
<!-- Branch intent-filter -->
12-
<intent-filter android:autoverify='true'>
12+
<intent-filter android:autoVerify='true'>
1313
<action android:name='android.intent.action.VIEW'/>
1414
<category android:name='android.intent.category.DEFAULT'/>
1515
<category android:name='android.intent.category.BROWSABLE'/>

0 commit comments

Comments
 (0)