Skip to content

Commit

Permalink
Merge pull request #318 from BranchMetrics/fix-release-scheme
Browse files Browse the repository at this point in the history
fix: able to have release schemes and archive in ios
  • Loading branch information
ethanneff authored Apr 18, 2017
2 parents 89cf3d7 + 6e66953 commit 96db6ca
Show file tree
Hide file tree
Showing 32 changed files with 2,101 additions and 259 deletions.
121 changes: 108 additions & 13 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "branch-cordova-sdk",
"description": "Branch Metrics Cordova SDK",
"main": "www/branch.js",
"version": "2.5.15",
"version": "2.5.16",
"homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion plugin.template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ SOFTWARE.
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="branch-cordova-sdk"
version="2.5.15">
version="2.5.16">

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

Expand Down
10 changes: 9 additions & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ SOFTWARE.
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="branch-cordova-sdk"
version="2.5.15">
version="2.5.16">

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

Expand Down Expand Up @@ -103,6 +103,8 @@ SOFTWARE.
<source-file src="src/ios/dependencies/Branch-SDK/BNCConfig.m" />
<header-file src="src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.h" />
<source-file src="src/ios/dependencies/Branch-SDK/BNCContentDiscoveryManager.m" />
<header-file src="src/ios/dependencies/Branch-SDK/BNCDebug.h" />
<source-file src="src/ios/dependencies/Branch-SDK/BNCDebug.m" />
<header-file src="src/ios/dependencies/Branch-SDK/BNCDeviceInfo.h" />
<source-file src="src/ios/dependencies/Branch-SDK/BNCDeviceInfo.m" />
<header-file src="src/ios/dependencies/Branch-SDK/BNCEncodingUtils.h" />
Expand All @@ -115,6 +117,8 @@ SOFTWARE.
<source-file src="src/ios/dependencies/Branch-SDK/BNCLinkCache.m" />
<header-file src="src/ios/dependencies/Branch-SDK/BNCLinkData.h" />
<source-file src="src/ios/dependencies/Branch-SDK/BNCLinkData.m" />
<header-file src="src/ios/dependencies/Branch-SDK/BNCLog.h" />
<source-file src="src/ios/dependencies/Branch-SDK/BNCLog.m" />
<header-file src="src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.h" />
<source-file src="src/ios/dependencies/Branch-SDK/BNCPreferenceHelper.m" />
<header-file src="src/ios/dependencies/Branch-SDK/BNCServerInterface.h" />
Expand Down Expand Up @@ -147,6 +151,8 @@ SOFTWARE.
<header-file src="src/ios/dependencies/Branch-SDK/BranchDeepLinkingController.h" />
<header-file src="src/ios/dependencies/Branch-SDK/BranchLinkProperties.h" />
<source-file src="src/ios/dependencies/Branch-SDK/BranchLinkProperties.m" />
<header-file src="src/ios/dependencies/Branch-SDK/BranchShareLink.h" />
<source-file src="src/ios/dependencies/Branch-SDK/BranchShareLink.m" />
<header-file src="src/ios/dependencies/Branch-SDK/BranchUniversalObject.h" />
<source-file src="src/ios/dependencies/Branch-SDK/BranchUniversalObject.m" />
<header-file src="src/ios/dependencies/Branch-SDK/BranchView.h" />
Expand All @@ -155,6 +161,8 @@ SOFTWARE.
<source-file src="src/ios/dependencies/Branch-SDK/BranchViewHandler.m" />
<header-file src="src/ios/dependencies/Branch-SDK/NSMutableDictionary+Branch.h" />
<source-file src="src/ios/dependencies/Branch-SDK/NSMutableDictionary+Branch.m" />
<header-file src="src/ios/dependencies/Branch-SDK/NSString+Branch.h" />
<source-file src="src/ios/dependencies/Branch-SDK/NSString+Branch.m" />

<header-file src="src/ios/dependencies/Branch-SDK/Requests/BNCServerRequest.h" />
<source-file src="src/ios/dependencies/Branch-SDK/Requests/BNCServerRequest.m" />
Expand Down
Binary file not shown.
4 changes: 3 additions & 1 deletion src/ios/dependencies/Branch-SDK/BNCCommerceEvent.m
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ - (NSDictionary*) dictionary {

assign(revenue);
assign(currency);
assign(transactionID);
if (self.transactionID) {
dictionary[@"transaction_id"] = self.transactionID;
}
assign(shipping);
assign(tax);
assign(coupon);
Expand Down
7 changes: 1 addition & 6 deletions src/ios/dependencies/Branch-SDK/BNCConfig.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@

#include "BNCConfig.h"

#if defined(BNCTesting)
NSString * const BNC_API_BASE_URL = @"https://auhong.api.beta.branch.io";
#else
NSString * const BNC_API_BASE_URL = @"https://api.branch.io";
#endif

NSString * const BNC_API_VERSION = @"v1";
NSString * const BNC_LINK_URL = @"https://bnc.lt";
NSString * const BNC_SDK_VERSION = @"0.13.5";
NSString * const BNC_SDK_VERSION = @"0.14.12";
95 changes: 95 additions & 0 deletions src/ios/dependencies/Branch-SDK/BNCDebug.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@


//--------------------------------------------------------------------------------------------------
//
// BNCDebug.h
// Branch.framework
//
// Debugging Support
// Edward Smith, October 2016
//
// -©- Copyright © 2016 Branch, all rights reserved. -©-
//
//--------------------------------------------------------------------------------------------------


//--------------------------------------------------------------------------------------------------
/**
BNCDebug
========
# Useful run time debugging environmental variables
Set DYLD_IMAGE_SUFFIX to _debug to load debug versions of dynamic libraries.
Set NSDebugEnabled to YES to enable obj-c debug checks.
Set NSZombieEnabled to YES to enable zombies to help catch the referencing of released objects.
Set NSAutoreleaseFreedObjectCheckEnabled to YES to catch autorelease problems.
Set MallocStackLoggingNoCompact to YES to track and save all memory allocations. Memory intensive.
Check NSDebug.h for more debug switches. Also check Technical Note TN2124 and TN2239 for more info.
Useful exception breakpoints to set:
objc_exception_throw
NSInternalInconsistencyException
May be helpful for iPhone Simulator: GTM_DISABLE_IPHONE_LAUNCH_DAEMONS 1
Useful lldb macros (Works after Xcode 5.0):
command script import lldb.macosx.heap
Search the heap for all references to the pointer 0x0000000116e13920:
ptr_refs -m 0x0000000116e13920
*/
//--------------------------------------------------------------------------------------------------


#import <Foundation/Foundation.h>


#ifdef __cplusplus
extern "C" {
#endif


///@functiongroup Debugging Functions


///@return Returns true if the app is currently attached to a debugger.
extern BOOL BNCDebuggerIsAttached();


///@param object An obj-c instance, class, or meta-class.
///@return Returns an NSString with a dump of the methods and member variables of the instance,
/// class, or meta-class.
extern NSString* _Nonnull BNCDebugStringFromObject(id _Nullable object);


///@return Returns the names of all loaded classes as an array of NSStrings.
extern NSArray<NSString*> * _Nonnull BNCDebugArrayOfReqisteredClasses();


///@return Returns an NSString indicating the name of the enclosing method.
#define BNCSStringForCurrentMethod() \
NSStringFromSelector(_cmd)


///@return Returns an NSString indicating the name of the enclosing function.
#define BNCSStringForCurrentFunction() \
[NSString stringWithFormat:@"%s", __FUNCTION__]


/// Stops execution at the current execution point.
/// If attached to a debugger, current app will halt and wait for the debugger.
/// If not attached to a debugger then the current app will probably quit executing.
#define BNCDebugBreakpoint() \
do { raise(SIGINT); } while (0)


#ifdef __cplusplus
}
#endif
Loading

0 comments on commit 96db6ca

Please sign in to comment.