Skip to content

Commit 96db6ca

Browse files
ethanneffethanneff
authored
Merge pull request #318 from BranchMetrics/fix-release-scheme
fix: able to have release schemes and archive in ios
2 parents 89cf3d7 + 6e66953 commit 96db6ca

32 files changed

+2101
-259
lines changed

‎CHANGELOG.md

Lines changed: 108 additions & 13 deletions
Large diffs are not rendered by default.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "branch-cordova-sdk",
33
"description": "Branch Metrics Cordova SDK",
44
"main": "www/branch.js",
5-
"version": "2.5.15",
5+
"version": "2.5.16",
66
"homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
77
"repository": {
88
"type": "git",

‎plugin.template.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ SOFTWARE.
2424
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
2525
xmlns:android="http://schemas.android.com/apk/res/android"
2626
id="branch-cordova-sdk"
27-
version="2.5.15">
27+
version="2.5.16">
2828

2929
<!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
3030

‎plugin.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ SOFTWARE.
2424
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
2525
xmlns:android="http://schemas.android.com/apk/res/android"
2626
id="branch-cordova-sdk"
27-
version="2.5.15">
27+
version="2.5.16">
2828

2929
<!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
3030

@@ -103,6 +103,8 @@ SOFTWARE.
103103
<source-file src="src/ios/dependencies/Branch-SDK/BNCConfig.m" />
104104
<header-file src="src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.h" />
105105
<source-file src="src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.m" />
106+
<header-file src="src/ios/dependencies/Branch-SDK/BNCDebug.h" />
107+
<source-file src="src/ios/dependencies/Branch-SDK/BNCDebug.m" />
106108
<header-file src="src/ios/dependencies/Branch-SDK/BNCDeviceInfo.h" />
107109
<source-file src="src/ios/dependencies/Branch-SDK/BNCDeviceInfo.m" />
108110
<header-file src="src/ios/dependencies/Branch-SDK/BNCEncodingUtils.h" />
@@ -115,6 +117,8 @@ SOFTWARE.
115117
<source-file src="src/ios/dependencies/Branch-SDK/BNCLinkCache.m" />
116118
<header-file src="src/ios/dependencies/Branch-SDK/BNCLinkData.h" />
117119
<source-file src="src/ios/dependencies/Branch-SDK/BNCLinkData.m" />
120+
<header-file src="src/ios/dependencies/Branch-SDK/BNCLog.h" />
121+
<source-file src="src/ios/dependencies/Branch-SDK/BNCLog.m" />
118122
<header-file src="src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.h" />
119123
<source-file src="src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.m" />
120124
<header-file src="src/ios/dependencies/Branch-SDK/BNCServerInterface.h" />
@@ -147,6 +151,8 @@ SOFTWARE.
147151
<header-file src="src/ios/dependencies/Branch-SDK/BranchDeepLinkingController.h" />
148152
<header-file src="src/ios/dependencies/Branch-SDK/BranchLinkProperties.h" />
149153
<source-file src="src/ios/dependencies/Branch-SDK/BranchLinkProperties.m" />
154+
<header-file src="src/ios/dependencies/Branch-SDK/BranchShareLink.h" />
155+
<source-file src="src/ios/dependencies/Branch-SDK/BranchShareLink.m" />
150156
<header-file src="src/ios/dependencies/Branch-SDK/BranchUniversalObject.h" />
151157
<source-file src="src/ios/dependencies/Branch-SDK/BranchUniversalObject.m" />
152158
<header-file src="src/ios/dependencies/Branch-SDK/BranchView.h" />
@@ -155,6 +161,8 @@ SOFTWARE.
155161
<source-file src="src/ios/dependencies/Branch-SDK/BranchViewHandler.m" />
156162
<header-file src="src/ios/dependencies/Branch-SDK/NSMutableDictionary+Branch.h" />
157163
<source-file src="src/ios/dependencies/Branch-SDK/NSMutableDictionary+Branch.m" />
164+
<header-file src="src/ios/dependencies/Branch-SDK/NSString+Branch.h" />
165+
<source-file src="src/ios/dependencies/Branch-SDK/NSString+Branch.m" />
158166

159167
<header-file src="src/ios/dependencies/Branch-SDK/Requests/BNCServerRequest.h" />
160168
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BNCServerRequest.m" />

‎src/android/dependencies/Branch-2.5.9.jar renamed to ‎src/android/dependencies/Branch-2.6.1.jar

235 KB
Binary file not shown.

‎src/ios/dependencies/Branch-SDK/BNCCommerceEvent.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ - (NSDictionary*) dictionary {
8484

8585
assign(revenue);
8686
assign(currency);
87-
assign(transactionID);
87+
if (self.transactionID) {
88+
dictionary[@"transaction_id"] = self.transactionID;
89+
}
8890
assign(shipping);
8991
assign(tax);
9092
assign(coupon);

‎src/ios/dependencies/Branch-SDK/BNCConfig.m

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

99
#include "BNCConfig.h"
1010

11-
#if defined(BNCTesting)
12-
NSString * const BNC_API_BASE_URL = @"https://auhong.api.beta.branch.io";
13-
#else
1411
NSString * const BNC_API_BASE_URL = @"https://api.branch.io";
15-
#endif
16-
1712
NSString * const BNC_API_VERSION = @"v1";
1813
NSString * const BNC_LINK_URL = @"https://bnc.lt";
19-
NSString * const BNC_SDK_VERSION = @"0.13.5";
14+
NSString * const BNC_SDK_VERSION = @"0.14.12";

‎src/ios/dependencies/Branch-SDK/BNCDebug.h

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
2+
3+
//--------------------------------------------------------------------------------------------------
4+
//
5+
// BNCDebug.h
6+
// Branch.framework
7+
//
8+
// Debugging Support
9+
// Edward Smith, October 2016
10+
//
11+
// -©- Copyright © 2016 Branch, all rights reserved. -©-
12+
//
13+
//--------------------------------------------------------------------------------------------------
14+
15+
16+
//--------------------------------------------------------------------------------------------------
17+
/**
18+
19+
BNCDebug
20+
========
21+
22+
# Useful run time debugging environmental variables
23+
24+
Set DYLD_IMAGE_SUFFIX to _debug to load debug versions of dynamic libraries.
25+
Set NSDebugEnabled to YES to enable obj-c debug checks.
26+
Set NSZombieEnabled to YES to enable zombies to help catch the referencing of released objects.
27+
Set NSAutoreleaseFreedObjectCheckEnabled to YES to catch autorelease problems.
28+
Set MallocStackLoggingNoCompact to YES to track and save all memory allocations. Memory intensive.
29+
30+
Check NSDebug.h for more debug switches. Also check Technical Note TN2124 and TN2239 for more info.
31+
32+
Useful exception breakpoints to set:
33+
34+
objc_exception_throw
35+
NSInternalInconsistencyException
36+
37+
May be helpful for iPhone Simulator: GTM_DISABLE_IPHONE_LAUNCH_DAEMONS 1
38+
39+
Useful lldb macros (Works after Xcode 5.0):
40+
41+
command script import lldb.macosx.heap
42+
43+
Search the heap for all references to the pointer 0x0000000116e13920:
44+
45+
ptr_refs -m 0x0000000116e13920
46+
47+
*/
48+
//--------------------------------------------------------------------------------------------------
49+
50+
51+
#import <Foundation/Foundation.h>
52+
53+
54+
#ifdef __cplusplus
55+
extern "C" {
56+
#endif
57+
58+
59+
///@functiongroup Debugging Functions
60+
61+
62+
///@return Returns true if the app is currently attached to a debugger.
63+
extern BOOL BNCDebuggerIsAttached();
64+
65+
66+
///@param object An obj-c instance, class, or meta-class.
67+
///@return Returns an NSString with a dump of the methods and member variables of the instance,
68+
/// class, or meta-class.
69+
extern NSString* _Nonnull BNCDebugStringFromObject(id _Nullable object);
70+
71+
72+
///@return Returns the names of all loaded classes as an array of NSStrings.
73+
extern NSArray<NSString*> * _Nonnull BNCDebugArrayOfReqisteredClasses();
74+
75+
76+
///@return Returns an NSString indicating the name of the enclosing method.
77+
#define BNCSStringForCurrentMethod() \
78+
NSStringFromSelector(_cmd)
79+
80+
81+
///@return Returns an NSString indicating the name of the enclosing function.
82+
#define BNCSStringForCurrentFunction() \
83+
[NSString stringWithFormat:@"%s", __FUNCTION__]
84+
85+
86+
/// Stops execution at the current execution point.
87+
/// If attached to a debugger, current app will halt and wait for the debugger.
88+
/// If not attached to a debugger then the current app will probably quit executing.
89+
#define BNCDebugBreakpoint() \
90+
do { raise(SIGINT); } while (0)
91+
92+
93+
#ifdef __cplusplus
94+
}
95+
#endif

0 commit comments

Comments
 (0)