Skip to content

Commit af79cba

Browse files
author
Edward Smith
committed
Fixed code found broken by the tests.
1 parent 1e4f54d commit af79cba

File tree

17 files changed

+123
-112
lines changed

17 files changed

+123
-112
lines changed

‎Branch-SDK/Branch-SDK/BNCServerRequestQueue.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ - (void)retrieve {
321321

322322
// Throw out invalid request types
323323
if (![request isKindOfClass:[BNCServerRequest class]]) {
324-
BNCLogWarning(@"Found an invalid request object, discarding.");
324+
BNCLogWarning(@"Found an invalid request object, discarding. Object is: %@.", request);
325325
continue;
326326
}
327327

‎Branch-TestBed-Swift/TestBed-Swift.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
10+
4D351A101F0D6362004BD4AA /* BNCLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D351A0F1F0D6362004BD4AA /* BNCLog.m */; };
1011
4D3A944B1E64C777007127B3 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D3A944A1E64C777007127B3 /* iAd.framework */; };
1112
4D4F283E1E400F9800282A34 /* BNCCommerceEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D4F27E01E400F9800282A34 /* BNCCommerceEvent.m */; };
1213
4D4F283F1E400F9800282A34 /* BNCConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D4F27E21E400F9800282A34 /* BNCConfig.m */; };
@@ -50,9 +51,9 @@
5051
4D4F28651E400F9800282A34 /* BranchShortUrlSyncRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D4F28311E400F9800282A34 /* BranchShortUrlSyncRequest.m */; };
5152
4D4F28661E400F9800282A34 /* BranchSpotlightUrlRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D4F28331E400F9800282A34 /* BranchSpotlightUrlRequest.m */; };
5253
4D4F28671E400F9800282A34 /* BranchUserCompletedActionRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D4F28351E400F9800282A34 /* BranchUserCompletedActionRequest.m */; };
54+
4D510D771F0D61BE003D720B /* Branch.m in Sources */ = {isa = PBXBuildFile; fileRef = 63AAF0F01CF7594400CA98BD /* Branch.m */; };
5355
4D9E765C1E774DB100BD0620 /* BranchShareLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D9E765B1E774DB100BD0620 /* BranchShareLink.m */; };
5456
4DB47D5E1F042C5900C53C29 /* BNCDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB47D591F042C5900C53C29 /* BNCDebug.m */; };
55-
4DB47D5F1F042C5900C53C29 /* BNCLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB47D5B1F042C5900C53C29 /* BNCLog.m */; };
5657
4DB47D601F042C5900C53C29 /* NSString+Branch.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB47D5D1F042C5900C53C29 /* NSString+Branch.m */; };
5758
4DF867F41E6DDC4E00BE4C5F /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DF867F31E6DDC4E00BE4C5F /* AdSupport.framework */; };
5859
6306D5BF1D6A33A7000306B3 /* BranchUniversalObjectPropertiesTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6306D5BE1D6A33A7000306B3 /* BranchUniversalObjectPropertiesTableViewController.swift */; };
@@ -71,7 +72,6 @@
7172
63AAF0C71CF758AF00CA98BD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63AAF0C51CF758AF00CA98BD /* Main.storyboard */; };
7273
63AAF0C91CF758AF00CA98BD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 63AAF0C81CF758AF00CA98BD /* Assets.xcassets */; };
7374
63AAF0CC1CF758AF00CA98BD /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 63AAF0CA1CF758AF00CA98BD /* LaunchScreen.storyboard */; };
74-
63AAF0F11CF7594400CA98BD /* Branch.m in Sources */ = {isa = PBXBuildFile; fileRef = 63AAF0F01CF7594400CA98BD /* Branch.m */; };
7575
63AAF0FD1CF7F4AD00CA98BD /* CreditHistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63AAF0FC1CF7F4AD00CA98BD /* CreditHistoryViewController.swift */; };
7676
63AAF1011CF7F58900CA98BD /* ContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63AAF1001CF7F58900CA98BD /* ContentViewController.swift */; };
7777
63BCC3591D5AC8D600CE0EB1 /* cancel-28.png in Resources */ = {isa = PBXBuildFile; fileRef = 63BCC3581D5AC8D600CE0EB1 /* cancel-28.png */; };
@@ -80,11 +80,11 @@
8080
63F65BFA1D654EF30055A2F6 /* DictionaryTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63F65BF91D654EF30055A2F6 /* DictionaryTableViewCell.swift */; };
8181
63F8BB201D57D2BE0013B6F7 /* LinkPropertiesTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63F8BB1F1D57D2BE0013B6F7 /* LinkPropertiesTableViewController.swift */; };
8282
63F8BB241D57E7730013B6F7 /* ArrayTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63F8BB231D57E7730013B6F7 /* ArrayTableViewController.swift */; };
83-
F155BFEF1EF37EDB00BF4566 /* BNCLog.m in Sources */ = {isa = PBXBuildFile; fileRef = F155BFEE1EF37EDB00BF4566 /* BNCLog.m */; };
8483
F155BFF21EF37EEA00BF4566 /* BNCDeepLinkViewControllerInstance.m in Sources */ = {isa = PBXBuildFile; fileRef = F155BFF11EF37EEA00BF4566 /* BNCDeepLinkViewControllerInstance.m */; };
8584
/* End PBXBuildFile section */
8685

8786
/* Begin PBXFileReference section */
87+
4D351A0F1F0D6362004BD4AA /* BNCLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCLog.m; sourceTree = "<group>"; };
8888
4D3A944A1E64C777007127B3 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; };
8989
4D4F27DE1E400F9800282A34 /* BNCCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCCallbacks.h; sourceTree = "<group>"; };
9090
4D4F27DF1E400F9800282A34 /* BNCCommerceEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCCommerceEvent.h; sourceTree = "<group>"; };
@@ -184,8 +184,6 @@
184184
4D9E765B1E774DB100BD0620 /* BranchShareLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchShareLink.m; sourceTree = "<group>"; };
185185
4DB47D581F042C5900C53C29 /* BNCDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCDebug.h; sourceTree = "<group>"; };
186186
4DB47D591F042C5900C53C29 /* BNCDebug.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCDebug.m; sourceTree = "<group>"; };
187-
4DB47D5A1F042C5900C53C29 /* BNCLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCLog.h; sourceTree = "<group>"; };
188-
4DB47D5B1F042C5900C53C29 /* BNCLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCLog.m; sourceTree = "<group>"; };
189187
4DB47D5C1F042C5900C53C29 /* NSString+Branch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Branch.h"; sourceTree = "<group>"; };
190188
4DB47D5D1F042C5900C53C29 /* NSString+Branch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Branch.m"; sourceTree = "<group>"; };
191189
4DF867F31E6DDC4E00BE4C5F /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
@@ -218,7 +216,6 @@
218216
63F8BB1F1D57D2BE0013B6F7 /* LinkPropertiesTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LinkPropertiesTableViewController.swift; sourceTree = "<group>"; };
219217
63F8BB231D57E7730013B6F7 /* ArrayTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArrayTableViewController.swift; sourceTree = "<group>"; };
220218
F155BFED1EF37EDB00BF4566 /* BNCLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCLog.h; sourceTree = "<group>"; };
221-
F155BFEE1EF37EDB00BF4566 /* BNCLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCLog.m; sourceTree = "<group>"; };
222219
F155BFF01EF37EEA00BF4566 /* BNCDeepLinkViewControllerInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCDeepLinkViewControllerInstance.h; sourceTree = "<group>"; };
223220
F155BFF11EF37EEA00BF4566 /* BNCDeepLinkViewControllerInstance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCDeepLinkViewControllerInstance.m; sourceTree = "<group>"; };
224221
/* End PBXFileReference section */
@@ -269,6 +266,8 @@
269266
4D4F27E41E400F9800282A34 /* BNCContentDiscoveryManager.m */,
270267
4DB47D581F042C5900C53C29 /* BNCDebug.h */,
271268
4DB47D591F042C5900C53C29 /* BNCDebug.m */,
269+
F155BFF01EF37EEA00BF4566 /* BNCDeepLinkViewControllerInstance.h */,
270+
F155BFF11EF37EEA00BF4566 /* BNCDeepLinkViewControllerInstance.m */,
272271
4D4F27E51E400F9800282A34 /* BNCDeviceInfo.h */,
273272
4D4F27E61E400F9800282A34 /* BNCDeviceInfo.m */,
274273
4D4F27E71E400F9800282A34 /* BNCEncodingUtils.h */,
@@ -281,8 +280,8 @@
281280
4D4F27EE1E400F9800282A34 /* BNCLinkCache.m */,
282281
4D4F27EF1E400F9800282A34 /* BNCLinkData.h */,
283282
4D4F27F01E400F9800282A34 /* BNCLinkData.m */,
284-
4DB47D5A1F042C5900C53C29 /* BNCLog.h */,
285-
4DB47D5B1F042C5900C53C29 /* BNCLog.m */,
283+
F155BFED1EF37EDB00BF4566 /* BNCLog.h */,
284+
4D351A0F1F0D6362004BD4AA /* BNCLog.m */,
286285
4D4F27F11E400F9800282A34 /* BNCPreferenceHelper.h */,
287286
4D4F27F21E400F9800282A34 /* BNCPreferenceHelper.m */,
288287
4D4F27F31E400F9800282A34 /* BNCServerInterface.h */,
@@ -325,15 +324,8 @@
325324
4D4F28161E400F9800282A34 /* BranchViewHandler.m */,
326325
4D4F28171E400F9800282A34 /* NSMutableDictionary+Branch.h */,
327326
4D4F28181E400F9800282A34 /* NSMutableDictionary+Branch.m */,
328-
<<<<<<< HEAD
329-
F155BFF01EF37EEA00BF4566 /* BNCDeepLinkViewControllerInstance.h */,
330-
F155BFF11EF37EEA00BF4566 /* BNCDeepLinkViewControllerInstance.m */,
331-
F155BFED1EF37EDB00BF4566 /* BNCLog.h */,
332-
F155BFEE1EF37EDB00BF4566 /* BNCLog.m */,
333-
=======
334327
4DB47D5C1F042C5900C53C29 /* NSString+Branch.h */,
335328
4DB47D5D1F042C5900C53C29 /* NSString+Branch.m */,
336-
>>>>>>> 12ca4d3428198933aac335d042e534dbd4e81da8
337329
4D4F28191E400F9800282A34 /* Requests */,
338330
);
339331
path = "Branch-SDK";
@@ -560,13 +552,13 @@
560552
4D4F285E1E400F9800282A34 /* BranchLoadRewardsRequest.m in Sources */,
561553
4D4F28511E400F9800282A34 /* BranchContentDiscoverer.m in Sources */,
562554
4D4F28611E400F9800282A34 /* BranchRedeemRewardsRequest.m in Sources */,
555+
4D351A101F0D6362004BD4AA /* BNCLog.m in Sources */,
563556
4D4F28661E400F9800282A34 /* BranchSpotlightUrlRequest.m in Sources */,
564557
4D4F284E1E400F9800282A34 /* Branch.m in Sources */,
565558
63AAF0FD1CF7F4AD00CA98BD /* CreditHistoryViewController.swift in Sources */,
566559
4D4F28471E400F9800282A34 /* BNCPreferenceHelper.m in Sources */,
567560
4D4F28461E400F9800282A34 /* BNCLinkData.m in Sources */,
568561
4D4F28491E400F9800282A34 /* BNCServerRequestQueue.m in Sources */,
569-
4DB47D5F1F042C5900C53C29 /* BNCLog.m in Sources */,
570562
4D4F28561E400F9800282A34 /* BranchUniversalObject.m in Sources */,
571563
4D4F28571E400F9800282A34 /* BranchView.m in Sources */,
572564
4D4F28591E400F9800282A34 /* NSMutableDictionary+Branch.m in Sources */,
@@ -583,14 +575,12 @@
583575
63F8BB241D57E7730013B6F7 /* ArrayTableViewController.swift in Sources */,
584576
63AAF1011CF7F58900CA98BD /* ContentViewController.swift in Sources */,
585577
63F8BB201D57D2BE0013B6F7 /* LinkPropertiesTableViewController.swift in Sources */,
586-
F155BFEF1EF37EDB00BF4566 /* BNCLog.m in Sources */,
587578
6306FFF11D6BEFA30031D2E3 /* ArrayTableViewCell.swift in Sources */,
588579
4D4F285B1E400F9800282A34 /* BranchCloseRequest.m in Sources */,
589580
4D9E765C1E774DB100BD0620 /* BranchShareLink.m in Sources */,
590581
4D4F28671E400F9800282A34 /* BranchUserCompletedActionRequest.m in Sources */,
591582
4D4F28521E400F9800282A34 /* BranchContentDiscoveryManifest.m in Sources */,
592583
63865EB11D60E7B6006071CE /* DictionaryTableViewController.swift in Sources */,
593-
63AAF0F11CF7594400CA98BD /* Branch.m in Sources */,
594584
4D4F283F1E400F9800282A34 /* BNCConfig.m in Sources */,
595585
4D4F284F1E400F9800282A34 /* BranchActivityItemProvider.m in Sources */,
596586
4D4F28481E400F9800282A34 /* BNCServerInterface.m in Sources */,
@@ -608,6 +598,7 @@
608598
633EEA6C1CF942C4000AE1BC /* NavigationController.swift in Sources */,
609599
63F65BFA1D654EF30055A2F6 /* DictionaryTableViewCell.swift in Sources */,
610600
4DB47D601F042C5900C53C29 /* NSString+Branch.m in Sources */,
601+
4D510D771F0D61BE003D720B /* Branch.m in Sources */,
611602
4D4F28581E400F9800282A34 /* BranchViewHandler.m in Sources */,
612603
63AAF0C21CF758AF00CA98BD /* AppDelegate.swift in Sources */,
613604
);

‎Branch-TestBed-Swift/TestBed-Swift/AppDelegate.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
3636
} else {
3737
DataStore.setActivePendingSetDebugEnabled(false)
3838
}
39-
branch.registerDeepLinkController(kCATransitionFromLeft, forKey: <#T##String!#>, withPresentation: <#T##BNCViewControllerPresentationOption#>)
4039
branch.initSession(launchOptions: launchOptions, andRegisterDeepLinkHandler: { (params, error) in
4140
if (error == nil) {
4241

‎Branch-TestBed-Xcode-7/Branch-TestBed.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@
103103
4D44E7D21E68F46800793D79 /* Branch-SDK-Tests.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4D44E7BE1E68F31B00793D79 /* Branch-SDK-Tests.strings */; };
104104
4D46F63B1E7B4588002317B6 /* BranchShareLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D46F6391E7B4588002317B6 /* BranchShareLink.h */; };
105105
4D46F63C1E7B4588002317B6 /* BranchShareLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D46F63A1E7B4588002317B6 /* BranchShareLink.m */; };
106+
4D60C7761F0D66290090DD5B /* BNCDeepLinkViewControllerInstance.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D60C7741F0D66280090DD5B /* BNCDeepLinkViewControllerInstance.h */; };
107+
4D60C7771F0D66290090DD5B /* BNCDeepLinkViewControllerInstance.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D60C7751F0D66290090DD5B /* BNCDeepLinkViewControllerInstance.m */; };
106108
4D8999EC1DC108FF00F7EE0A /* BNCXcode7Support.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D8999EA1DC108FF00F7EE0A /* BNCXcode7Support.h */; settings = {ATTRIBUTES = (Public, ); }; };
107109
4D8999ED1DC108FF00F7EE0A /* BNCXcode7Support.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D8999EB1DC108FF00F7EE0A /* BNCXcode7Support.m */; };
108110
4D8DFD971EC6399F00D47413 /* BNCTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D8DFD941EC6394300D47413 /* BNCTestCase.m */; };
@@ -243,6 +245,8 @@
243245
4D44E7C81E68F34E00793D79 /* NSString+Branch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Branch.m"; sourceTree = "<group>"; };
244246
4D46F6391E7B4588002317B6 /* BranchShareLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchShareLink.h; sourceTree = "<group>"; };
245247
4D46F63A1E7B4588002317B6 /* BranchShareLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchShareLink.m; sourceTree = "<group>"; };
248+
4D60C7741F0D66280090DD5B /* BNCDeepLinkViewControllerInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCDeepLinkViewControllerInstance.h; sourceTree = "<group>"; };
249+
4D60C7751F0D66290090DD5B /* BNCDeepLinkViewControllerInstance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCDeepLinkViewControllerInstance.m; sourceTree = "<group>"; };
246250
4D8999EA1DC108FF00F7EE0A /* BNCXcode7Support.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCXcode7Support.h; sourceTree = "<group>"; };
247251
4D8999EB1DC108FF00F7EE0A /* BNCXcode7Support.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCXcode7Support.m; sourceTree = "<group>"; };
248252
4D8DFD931EC6394300D47413 /* BNCTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCTestCase.h; sourceTree = "<group>"; };
@@ -520,6 +524,8 @@
520524
466D5A101B5991E3009DB845 /* BNCContentDiscoveryManager.m */,
521525
4D44E7C31E68F34E00793D79 /* BNCDebug.h */,
522526
4D44E7C41E68F34E00793D79 /* BNCDebug.m */,
527+
4D60C7741F0D66280090DD5B /* BNCDeepLinkViewControllerInstance.h */,
528+
4D60C7751F0D66290090DD5B /* BNCDeepLinkViewControllerInstance.m */,
523529
7D5882301CA1BEEA00FF6358 /* BNCDeviceInfo.h */,
524530
7D5882391CA1DF2700FF6358 /* BNCDeviceInfo.m */,
525531
464EA3991ACB38EC000E4094 /* BNCEncodingUtils.h */,
@@ -677,6 +683,7 @@
677683
466D5A111B5991E3009DB845 /* BNCContentDiscoveryManager.h in Headers */,
678684
54FF1F8D1BD1D4AE0004CE2E /* BranchUniversalObject.h in Headers */,
679685
46946B9F1B2689A100627BCC /* BranchShortUrlSyncRequest.h in Headers */,
686+
4D60C7761F0D66290090DD5B /* BNCDeepLinkViewControllerInstance.h in Headers */,
680687
46946B9E1B2689A100627BCC /* BranchShortUrlRequest.h in Headers */,
681688
466B58781B17780A00A69EDE /* BNCServerRequestQueue.h in Headers */,
682689
466B58751B17780A00A69EDE /* BNCServerInterface.h in Headers */,
@@ -785,7 +792,6 @@
785792
7E6B3B501AA42D0E005F45BF = {
786793
CreatedOnToolsVersion = 6.1.1;
787794
DevelopmentTeam = R63EM248DP;
788-
TestTargetID = 6700165F1940F51400A9E103;
789795
};
790796
};
791797
};
@@ -906,6 +912,7 @@
906912
463F0A3E1B20A663004235D2 /* BranchCloseRequest.m in Sources */,
907913
463F0A381B20A663004235D2 /* BranchCreditHistoryRequest.m in Sources */,
908914
466B585F1B17779C00A69EDE /* BNCSystemObserver.m in Sources */,
915+
4D60C7771F0D66290090DD5B /* BNCDeepLinkViewControllerInstance.m in Sources */,
909916
466B58611B17779C00A69EDE /* BNCServerRequestQueue.m in Sources */,
910917
4D46F63C1E7B4588002317B6 /* BranchShareLink.m in Sources */,
911918
4D3FA94B1DFF31EB00E2B6A9 /* BNCConfig.m in Sources */,
@@ -1158,7 +1165,7 @@
11581165
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.Branch-TestBed";
11591166
PRODUCT_NAME = "$(TARGET_NAME)";
11601167
PROVISIONING_PROFILE = "";
1161-
USER_HEADER_SEARCH_PATHS = "$PROJECT_DIR";
1168+
USER_HEADER_SEARCH_PATHS = $PROJECT_DIR;
11621169
WRAPPER_EXTENSION = app;
11631170
};
11641171
name = Debug;
@@ -1179,7 +1186,7 @@
11791186
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.Branch-TestBed";
11801187
PRODUCT_NAME = "$(TARGET_NAME)";
11811188
PROVISIONING_PROFILE = "";
1182-
USER_HEADER_SEARCH_PATHS = "$PROJECT_DIR";
1189+
USER_HEADER_SEARCH_PATHS = $PROJECT_DIR;
11831190
WRAPPER_EXTENSION = app;
11841191
};
11851192
name = Release;
@@ -1199,7 +1206,6 @@
11991206
MTL_ENABLE_DEBUG_INFO = YES;
12001207
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.$(PRODUCT_NAME:rfc1034identifier)";
12011208
PRODUCT_NAME = "$(TARGET_NAME)";
1202-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Branch-TestBed.app/Branch-TestBed";
12031209
};
12041210
name = Debug;
12051211
};
@@ -1214,7 +1220,6 @@
12141220
MTL_ENABLE_DEBUG_INFO = NO;
12151221
PRODUCT_BUNDLE_IDENTIFIER = "io.branch.sdk.$(PRODUCT_NAME:rfc1034identifier)";
12161222
PRODUCT_NAME = "$(TARGET_NAME)";
1217-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Branch-TestBed.app/Branch-TestBed";
12181223
};
12191224
name = Release;
12201225
};

‎Branch-TestBed-Xcode-7/Branch-TestBed.xcodeproj/xcshareddata/xcschemes/Branch-SDK-Tests.xcscheme‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -50,26 +50,11 @@
5050
</BuildableReference>
5151
</MacroExpansion>
5252
<AdditionalOptions>
53-
<AdditionalOption
54-
key = "DYLD_INSERT_LIBRARIES"
55-
value = "/usr/lib/libgmalloc.dylib"
56-
isEnabled = "YES">
57-
</AdditionalOption>
5853
<AdditionalOption
5954
key = "NSZombieEnabled"
6055
value = "YES"
6156
isEnabled = "YES">
6257
</AdditionalOption>
63-
<AdditionalOption
64-
key = "MallocGuardEdges"
65-
value = ""
66-
isEnabled = "YES">
67-
</AdditionalOption>
68-
<AdditionalOption
69-
key = "MallocScribble"
70-
value = ""
71-
isEnabled = "YES">
72-
</AdditionalOption>
7358
</AdditionalOptions>
7459
</TestAction>
7560
<LaunchAction
@@ -92,26 +77,11 @@
9277
</BuildableReference>
9378
</MacroExpansion>
9479
<AdditionalOptions>
95-
<AdditionalOption
96-
key = "DYLD_INSERT_LIBRARIES"
97-
value = "/usr/lib/libgmalloc.dylib"
98-
isEnabled = "YES">
99-
</AdditionalOption>
10080
<AdditionalOption
10181
key = "NSZombieEnabled"
10282
value = "YES"
10383
isEnabled = "YES">
10484
</AdditionalOption>
105-
<AdditionalOption
106-
key = "MallocGuardEdges"
107-
value = ""
108-
isEnabled = "YES">
109-
</AdditionalOption>
110-
<AdditionalOption
111-
key = "MallocScribble"
112-
value = ""
113-
isEnabled = "YES">
114-
</AdditionalOption>
11585
</AdditionalOptions>
11686
</LaunchAction>
11787
<ProfileAction

0 commit comments

Comments
 (0)