Skip to content

Commit 9e5319d

Browse files
author
Edward Smith
committed
Updates for 0.12.22 release.
1 parent 2c68666 commit 9e5319d

File tree

16 files changed

+67
-35
lines changed

16 files changed

+67
-35
lines changed

‎Branch-SDK/Branch-SDK/BNCConfig.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313

1414
NSString * const BNC_API_VERSION = @"v1";
1515
NSString * const BNC_LINK_URL = @"https://bnc.lt";
16-
NSString * const BNC_SDK_VERSION = @"0.12.21";
16+
NSString * const BNC_SDK_VERSION = @"0.12.22";

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

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

99
/* Begin PBXBuildFile section */
10-
2B6B1A061E020623001A8F1C /* BNCCommerceEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B6B1A041E020623001A8F1C /* BNCCommerceEvent.h */; };
11-
2B6B1A071E020623001A8F1C /* BNCCommerceEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B6B1A051E020623001A8F1C /* BNCCommerceEvent.m */; };
1210
460F4FA71B618A38002E84D6 /* BranchSpotlightUrlRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 460F4FA51B618A38002E84D6 /* BranchSpotlightUrlRequest.h */; };
1311
460F4FA81B618A38002E84D6 /* BranchSpotlightUrlRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 460F4FA61B618A38002E84D6 /* BranchSpotlightUrlRequest.m */; };
1412
461019461AE551A500379A15 /* BranchNetworkScenarioTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 461019451AE551A500379A15 /* BranchNetworkScenarioTests.m */; };
@@ -94,6 +92,8 @@
9492
4D3FA94B1DFF31EB00E2B6A9 /* BNCConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D3FA94A1DFF31EB00E2B6A9 /* BNCConfig.m */; };
9593
4D8999EC1DC108FF00F7EE0A /* BNCXcode7Support.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D8999EA1DC108FF00F7EE0A /* BNCXcode7Support.h */; };
9694
4D8999ED1DC108FF00F7EE0A /* BNCXcode7Support.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D8999EB1DC108FF00F7EE0A /* BNCXcode7Support.m */; };
95+
4D8EE7A51E1F0A5D00B1F450 /* BNCCommerceEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D8EE7A31E1F0A5D00B1F450 /* BNCCommerceEvent.h */; };
96+
4D8EE7A61E1F0A5D00B1F450 /* BNCCommerceEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D8EE7A41E1F0A5D00B1F450 /* BNCCommerceEvent.m */; };
9797
4DDC52621DCC08E700CFB737 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DDC52611DCC08E700CFB737 /* iAd.framework */; };
9898
54391A151BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 54391A131BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h */; };
9999
54391A161BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 54391A141BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.m */; };
@@ -152,8 +152,6 @@
152152
/* End PBXContainerItemProxy section */
153153

154154
/* Begin PBXFileReference section */
155-
2B6B1A041E020623001A8F1C /* BNCCommerceEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BNCCommerceEvent.h; path = "../Branch-SDK/Branch-SDK/BNCCommerceEvent.h"; sourceTree = SOURCE_ROOT; };
156-
2B6B1A051E020623001A8F1C /* BNCCommerceEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BNCCommerceEvent.m; path = "../Branch-SDK/Branch-SDK/BNCCommerceEvent.m"; sourceTree = SOURCE_ROOT; };
157155
423ACD2DEBB9A2E4FAF64B08 /* libPods-Branch-SDK-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Branch-SDK-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
158156
460F4FA51B618A38002E84D6 /* BranchSpotlightUrlRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchSpotlightUrlRequest.h; sourceTree = "<group>"; };
159157
460F4FA61B618A38002E84D6 /* BranchSpotlightUrlRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchSpotlightUrlRequest.m; sourceTree = "<group>"; };
@@ -214,6 +212,8 @@
214212
4D3FA94A1DFF31EB00E2B6A9 /* BNCConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCConfig.m; sourceTree = "<group>"; };
215213
4D8999EA1DC108FF00F7EE0A /* BNCXcode7Support.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCXcode7Support.h; sourceTree = "<group>"; };
216214
4D8999EB1DC108FF00F7EE0A /* BNCXcode7Support.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCXcode7Support.m; sourceTree = "<group>"; };
215+
4D8EE7A31E1F0A5D00B1F450 /* BNCCommerceEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCCommerceEvent.h; sourceTree = "<group>"; };
216+
4D8EE7A41E1F0A5D00B1F450 /* BNCCommerceEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCCommerceEvent.m; sourceTree = "<group>"; };
217217
4DC351441DF0AFB300646A1D /* Simulate-FirstRun.xcappdata */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = "Simulate-FirstRun.xcappdata"; sourceTree = "<group>"; };
218218
4DDC52611DCC08E700CFB737 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; };
219219
54391A131BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchCSSearchableItemAttributeSet.h; sourceTree = "<group>"; };
@@ -371,8 +371,6 @@
371371
467BA3581B7132A0003E458B /* Core */ = {
372372
isa = PBXGroup;
373373
children = (
374-
2B6B1A041E020623001A8F1C /* BNCCommerceEvent.h */,
375-
2B6B1A051E020623001A8F1C /* BNCCommerceEvent.m */,
376374
4659B34B1B0FD5BF0019767C /* BranchSetIdentityRequest.h */,
377375
4659B34C1B0FD5BF0019767C /* BranchSetIdentityRequest.m */,
378376
4659B34E1B0FDAB70019767C /* BranchLogoutRequest.h */,
@@ -480,6 +478,8 @@
480478
isa = PBXGroup;
481479
children = (
482480
E2B947491D15D73900F2270D /* BNCCallbacks.h */,
481+
4D8EE7A31E1F0A5D00B1F450 /* BNCCommerceEvent.h */,
482+
4D8EE7A41E1F0A5D00B1F450 /* BNCCommerceEvent.m */,
483483
7E6ACAF919E324120066913E /* BNCConfig.h */,
484484
4D3FA94A1DFF31EB00E2B6A9 /* BNCConfig.m */,
485485
466D5A0F1B5991E3009DB845 /* BNCContentDiscoveryManager.h */,
@@ -614,7 +614,7 @@
614614
462B50461B449DF000967B81 /* BranchDeepLinkingController.h in Headers */,
615615
E2B9474A1D15D75000F2270D /* BNCCallbacks.h in Headers */,
616616
54FF1F951BD20EB50004CE2E /* BranchRegisterViewRequest.h in Headers */,
617-
2B6B1A061E020623001A8F1C /* BNCCommerceEvent.h in Headers */,
617+
4D8EE7A51E1F0A5D00B1F450 /* BNCCommerceEvent.h in Headers */,
618618
46946B851B26898800627BCC /* BNCServerRequest.h in Headers */,
619619
466D5A111B5991E3009DB845 /* BNCContentDiscoveryManager.h in Headers */,
620620
466B58741B17780A00A69EDE /* BNCPreferenceHelper.h in Headers */,
@@ -837,7 +837,7 @@
837837
54FF1F8E1BD1D4AE0004CE2E /* BranchUniversalObject.m in Sources */,
838838
54FF1F961BD20EB50004CE2E /* BranchRegisterViewRequest.m in Sources */,
839839
463F0A321B20A663004235D2 /* BranchSetIdentityRequest.m in Sources */,
840-
2B6B1A071E020623001A8F1C /* BNCCommerceEvent.m in Sources */,
840+
4D8EE7A61E1F0A5D00B1F450 /* BNCCommerceEvent.m in Sources */,
841841
463F0A3C1B20A663004235D2 /* BranchShortUrlRequest.m in Sources */,
842842
7D4DAC251C8FA908008E37DB /* BranchViewHandler.m in Sources */,
843843
466B58591B17779C00A69EDE /* BNCPreferenceHelper.m in Sources */,

‎Branch.framework.zip‎

306 KB
Binary file not shown.

‎Branch.framework/Versions/A/Branch‎

689 KB
Binary file not shown.

‎Branch.framework/Versions/A/Headers/BNCConfig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#import <Foundation/Foundation.h>
1010

11-
extern NSString * const SDK_VERSION;
11+
extern NSString * const BNC_SDK_VERSION;
1212
extern NSString * const BNC_API_BASE_URL;
1313
extern NSString * const BNC_LINK_URL;
1414
extern NSString * const BNC_API_VERSION;

‎Branch.framework/Versions/A/Headers/Branch.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#import "BNCServerRequestQueue.h"
2020
#import "BranchActivityItemProvider.h"
2121
#import "BranchDeepLinkingController.h"
22+
#import "BNCCommerceEvent.h"
2223

2324
/**
2425
`Branch` is the primary interface of the Branch iOS SDK. Currently, all interactions you will make are funneled through this class. It is not meant to be instantiated or subclassed, usage should be limited to the global instance.
@@ -690,6 +691,22 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
690691
*/
691692
- (void)userCompletedAction:(NSString *)action withState:(NSDictionary *)state withDelegate:(id)branchViewCallback;
692693

694+
/**
695+
Sends a user commerce event to the server.
696+
697+
Use commerce events to track when a user purchases an item in your online store,
698+
makes an in-app purchase, or buys a subscription. The commerce events are tracked in
699+
the Branch dashboard along with your other events so you can judge the effectiveness of
700+
campaigns and other analytics.
701+
702+
@param commerceEvent The BNCCommerceEvent that describes the purchase.
703+
@param metadata Optional metadata you may want add to the event.
704+
@param completion The optional completion callback.
705+
*/
706+
- (void) sendCommerceEvent:(BNCCommerceEvent*)commerceEvent
707+
metadata:(NSDictionary<NSString*,id>*)metadata
708+
withCompletion:(void (^) (NSDictionary*response, NSError*error))completion;
709+
693710
#pragma mark - Short Url Sync methods
694711

695712
///---------------------------------------

‎Branch.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Branch"
3-
s.version = "0.12.21"
3+
s.version = "0.12.22"
44
s.summary = "Create an HTTP URL for any piece of content in your app"
55
s.description = <<-DESC
66
- Want the highest possible conversions on your sharing feature?

‎ChangeLog.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
Branch iOS SDK Change Log
22

3+
- v0.12.22
4+
* Fixed a crash when the root view controller is UINavigationController during strong matching (#539).
5+
* Updated documentation.
6+
* Warn when a user purchase event conflicts with a commerce event DANA-77 (#538).
7+
* Added product categories DANA-75 (#537).
8+
* Fixed a potential initialization race condition (#535).
9+
* Updated the Branch-TestBed-Swift example.
10+
* Fixed problem where getLatestReferringParams was sometimes returning the wrong params (#532).
11+
312
- v0.12.21
413
* > Beta Release <
514
* Fixed iOS 10.2.2 app install/update reporting (INFRA-1484).
@@ -341,7 +350,7 @@ Branch iOS SDK Change Log
341350

342351
- v0.8.2
343352
* Fix issue with callbacks being lost on some of the internal requests.
344-
* Fix issue with old requests not fitting the new request format, causing crsahes.
353+
* Fix issue with old requests not fitting the new request format, causing crashes.
345354

346355
- v0.8.1
347356
* Fix potential for bad reference when no callback is provided to `redeemRewards` call.

‎carthage-files/BranchSDK.xcodeproj/project.pbxproj‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
/* Begin PBXBuildFile section */
1010
4D19C1C21DC110FB008D8B38 /* BNCXcode7Support.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D19C1C01DC110FA008D8B38 /* BNCXcode7Support.h */; };
1111
4D19C1C31DC110FB008D8B38 /* BNCXcode7Support.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D19C1C11DC110FB008D8B38 /* BNCXcode7Support.m */; };
12+
4D3922BD1E1F0C85004FB7C8 /* BNCCommerceEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D3922BC1E1F0C85004FB7C8 /* BNCCommerceEvent.h */; };
1213
4D3FA94D1DFF3F6C00E2B6A9 /* BNCConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D3FA94C1DFF3F6C00E2B6A9 /* BNCConfig.m */; };
14+
4DA40A8F1E1F0011004D2534 /* BNCCommerceEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DA40A8D1E1F0011004D2534 /* BNCCommerceEvent.m */; };
1315
7DA3BF1D1D889CE500CA8AE0 /* BranchContentDiscoverer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DA3BF171D889CE500CA8AE0 /* BranchContentDiscoverer.m */; };
1416
7DA3BF1E1D889CE500CA8AE0 /* BranchContentDiscoverer.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DA3BF181D889CE500CA8AE0 /* BranchContentDiscoverer.h */; };
1517
7DA3BF1F1D889CE500CA8AE0 /* BranchContentDiscoveryManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DA3BF191D889CE500CA8AE0 /* BranchContentDiscoveryManifest.h */; };
@@ -95,7 +97,9 @@
9597
/* Begin PBXFileReference section */
9698
4D19C1C01DC110FA008D8B38 /* BNCXcode7Support.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCXcode7Support.h; sourceTree = "<group>"; };
9799
4D19C1C11DC110FB008D8B38 /* BNCXcode7Support.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCXcode7Support.m; sourceTree = "<group>"; };
100+
4D3922BC1E1F0C85004FB7C8 /* BNCCommerceEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCCommerceEvent.h; sourceTree = "<group>"; };
98101
4D3FA94C1DFF3F6C00E2B6A9 /* BNCConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCConfig.m; sourceTree = "<group>"; };
102+
4DA40A8D1E1F0011004D2534 /* BNCCommerceEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCCommerceEvent.m; sourceTree = "<group>"; };
99103
7DA3BF171D889CE500CA8AE0 /* BranchContentDiscoverer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchContentDiscoverer.m; sourceTree = "<group>"; };
100104
7DA3BF181D889CE500CA8AE0 /* BranchContentDiscoverer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchContentDiscoverer.h; sourceTree = "<group>"; };
101105
7DA3BF191D889CE500CA8AE0 /* BranchContentDiscoveryManifest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchContentDiscoveryManifest.h; sourceTree = "<group>"; };
@@ -203,6 +207,8 @@
203207
isa = PBXGroup;
204208
children = (
205209
E2B9477A1D15E31700F2270D /* BNCCallbacks.h */,
210+
4D3922BC1E1F0C85004FB7C8 /* BNCCommerceEvent.h */,
211+
4DA40A8D1E1F0011004D2534 /* BNCCommerceEvent.m */,
206212
E230A1151D03DB9E006181D8 /* BNCConfig.h */,
207213
4D3FA94C1DFF3F6C00E2B6A9 /* BNCConfig.m */,
208214
E230A1161D03DB9E006181D8 /* BNCContentDiscoveryManager.h */,
@@ -339,6 +345,7 @@
339345
isa = PBXHeadersBuildPhase;
340346
buildActionMask = 2147483647;
341347
files = (
348+
4D3922BD1E1F0C85004FB7C8 /* BNCCommerceEvent.h in Headers */,
342349
E230A1941D03DB9E006181D8 /* BranchView.h in Headers */,
343350
E230A1791D03DB9E006181D8 /* BNCPreferenceHelper.h in Headers */,
344351
E230A17B1D03DB9E006181D8 /* BNCServerInterface.h in Headers */,
@@ -412,7 +419,7 @@
412419
E298D0491C73D1B800589D22 /* Project object */ = {
413420
isa = PBXProject;
414421
attributes = {
415-
LastUpgradeCheck = 0720;
422+
LastUpgradeCheck = 0820;
416423
ORGANIZATIONNAME = "Ahmed Nawar";
417424
TargetAttributes = {
418425
E298D0511C73D1B800589D22 = {
@@ -462,6 +469,7 @@
462469
E230A1741D03DB9E006181D8 /* BNCError.m in Sources */,
463470
E230A1951D03DB9E006181D8 /* BranchView.m in Sources */,
464471
E230A1901D03DB9E006181D8 /* BranchLinkProperties.m in Sources */,
472+
4DA40A8F1E1F0011004D2534 /* BNCCommerceEvent.m in Sources */,
465473
E230A1AB1D03DB9E006181D8 /* BranchOpenRequest.m in Sources */,
466474
E230A1B11D03DB9E006181D8 /* BranchSetIdentityRequest.m in Sources */,
467475
E230A1B51D03DB9E006181D8 /* BranchShortUrlSyncRequest.m in Sources */,
@@ -511,8 +519,10 @@
511519
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
512520
CLANG_WARN_EMPTY_BODY = YES;
513521
CLANG_WARN_ENUM_CONVERSION = YES;
522+
CLANG_WARN_INFINITE_RECURSION = YES;
514523
CLANG_WARN_INT_CONVERSION = YES;
515524
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
525+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
516526
CLANG_WARN_UNREACHABLE_CODE = YES;
517527
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
518528
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -558,8 +568,10 @@
558568
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
559569
CLANG_WARN_EMPTY_BODY = YES;
560570
CLANG_WARN_ENUM_CONVERSION = YES;
571+
CLANG_WARN_INFINITE_RECURSION = YES;
561572
CLANG_WARN_INT_CONVERSION = YES;
562573
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
574+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
563575
CLANG_WARN_UNREACHABLE_CODE = YES;
564576
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
565577
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";

‎carthage-files/BranchSDK.xcodeproj/xcshareddata/xcschemes/Branch iOS SDK Carthage.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0720"
3+
LastUpgradeVersion = "0820"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)