Merge pull request #214 from BranchMetrics/update-ios-sdk

Update iOS SDK to 0.15.3

Author: jdee

examples/testbed_native_ios/Podfile.lock

@@ -1,12 +1,12 @@
 PODS:
-  - Branch-SDK (0.14.12):
-    - Branch-SDK/Core (= 0.14.12)
-    - Branch-SDK/without-IDFA (= 0.14.12)
-  - Branch-SDK/Core (0.14.12)
-  - Branch-SDK/without-IDFA (0.14.12)
+  - Branch-SDK (0.15.3):
+    - Branch-SDK/Core (= 0.15.3)
+    - Branch-SDK/without-IDFA (= 0.15.3)
+  - Branch-SDK/Core (0.15.3)
+  - Branch-SDK/without-IDFA (0.15.3)
   - React (0.42.3):
     - React/Core (= 0.42.3)
-  - react-native-branch (2.0.0-beta.4):
+  - react-native-branch (2.0.0-beta.6):
     - Branch-SDK
     - React
   - React/Core (0.42.3):
@@ -50,9 +50,9 @@ EXTERNAL SOURCES:
     :path: node_modules/react-native/ReactCommon/yoga
 
 SPEC CHECKSUMS:
-  Branch-SDK: 8a59b08daa0b283cd1bf0fd4842a521885e35ae6
+  Branch-SDK: 07641c651b8cf3aaee9e250785377e37a2099950
   React: 35e039680feacd0563677d49ba410112d2748559
-  react-native-branch: 67cdd488b224814f94b40deb9741598ba169d845
+  react-native-branch: 986b869e807976b340d7e799b32d09c82afc5cde
   Yoga: 86ce777665c8259b94ef8dbea76b84634237f4ea
 
 PODFILE CHECKSUM: add4645b825f22aaa2eb629899a1687f650a9588

examples/webview_example_native_ios/Podfile.lock

@@ -1,13 +1,13 @@
 PODS:
-  - Branch-SDK (0.14.12):
-    - Branch-SDK/Core (= 0.14.12)
-    - Branch-SDK/without-IDFA (= 0.14.12)
-  - Branch-SDK/Core (0.14.12)
-  - Branch-SDK/without-IDFA (0.14.12)
+  - Branch-SDK (0.15.3):
+    - Branch-SDK/Core (= 0.15.3)
+    - Branch-SDK/without-IDFA (= 0.15.3)
+  - Branch-SDK/Core (0.15.3)
+  - Branch-SDK/without-IDFA (0.15.3)
   - Cartography (1.1.0)
   - React (0.42.3):
     - React/Core (= 0.42.3)
-  - react-native-branch (2.0.0-beta.3):
+  - react-native-branch (2.0.0-beta.6):
     - Branch-SDK
     - React
   - React/Core (0.42.3):
@@ -54,10 +54,10 @@ EXTERNAL SOURCES:
     :path: node_modules/react-native/ReactCommon/yoga
 
 SPEC CHECKSUMS:
-  Branch-SDK: 8a59b08daa0b283cd1bf0fd4842a521885e35ae6
+  Branch-SDK: 07641c651b8cf3aaee9e250785377e37a2099950
   Cartography: '0538ccb4044acbbda2266335fc58cb4228794d90'
   React: 35e039680feacd0563677d49ba410112d2748559
-  react-native-branch: 55612ff46bcddee14cd40eb654f8fdb81ebc69b8
+  react-native-branch: 986b869e807976b340d7e799b32d09c82afc5cde
   TextAttributes: 45b2713a1d174c377d320b51129c304eac381638
   Yoga: 86ce777665c8259b94ef8dbea76b84634237f4ea
 

ios/Branch-SDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Branch-SDK"
-  s.version          = "0.14.12"
+  s.version          = "0.15.3"
   s.summary          = "Create an HTTP URL for any piece of content in your app"
   s.description      = <<-DESC
 - Want the highest possible conversions on your sharing feature?

ios/Branch-SDK/Branch-SDK/BNCConfig.m

@@ -11,4 +11,4 @@
 NSString * const BNC_API_BASE_URL    = @"https://api.branch.io";
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"0.14.12";
+NSString * const BNC_SDK_VERSION     = @"0.15.3";

ios/Branch-SDK/Branch-SDK/BNCLog.h

@@ -119,18 +119,26 @@ extern void BNCLogSetFlushFunction(BNCLogFlushFunctionPtr _Nullable flushFunctio
 extern BNCLogFlushFunctionPtr _Nullable BNCLogFlushFunction();
 
 
-#pragma mark - BNCLogMessageInternal
+#pragma mark - BNCLogWriteMessage
 
 
-/// The main logging function used in the logging defines.
-extern void BNCLogMessageInternal(
+/// The main logging function used in the variadic logging defines.
+extern void BNCLogWriteMessageFormat(
     BNCLogLevel logLevel,
     const char *_Nullable sourceFileName,
     int sourceLineNumber,
     id _Nullable messageFormat,
     ...
 );
 
+/// Swift-friendly wrapper for BNCLogWriteMessageFormat
+extern void BNCLogWriteMessage(
+    BNCLogLevel logLevel,
+    NSString *_Nonnull sourceFileName,
+    NSUInteger sourceLineNumber,
+    NSString *_Nonnull message
+);
+
 /// This function synchronizes all outstanding log messages and writes them to the logging function
 /// set by BNCLogSetOutputFunction.
 extern void BNCLogFlushMessages();
@@ -141,25 +149,25 @@ extern void BNCLogFlushMessages();
 
 ///@param format Log a debug message with the specified formatting.
 #define BNCLogDebug(...) \
-    do  { BNCLogMessageInternal(BNCLogLevelDebug, __FILE__, __LINE__, __VA_ARGS__); } while (0)
+    do  { BNCLogWriteMessageFormat(BNCLogLevelDebug, __FILE__, __LINE__, __VA_ARGS__); } while (0)
 
 ///@param format Log a warning message with the specified formatting.
 #define BNCLogWarning(...) \
-    do  { BNCLogMessageInternal(BNCLogLevelWarning, __FILE__, __LINE__, __VA_ARGS__); } while (0)
+    do  { BNCLogWriteMessageFormat(BNCLogLevelWarning, __FILE__, __LINE__, __VA_ARGS__); } while (0)
 
 ///@param format Log an error message with the specified formatting.
 #define BNCLogError(...) \
-    do  { BNCLogMessageInternal(BNCLogLevelError, __FILE__, __LINE__, __VA_ARGS__); } while (0)
+    do  { BNCLogWriteMessageFormat(BNCLogLevelError, __FILE__, __LINE__, __VA_ARGS__); } while (0)
 
 ///@param format Log a message with the specified formatting.
 #define BNCLog(...) \
-    do  { BNCLogMessageInternal(BNCLogLevelLog, __FILE__, __LINE__, __VA_ARGS__); } while (0)
+    do  { BNCLogWriteMessageFormat(BNCLogLevelLog, __FILE__, __LINE__, __VA_ARGS__); } while (0)
 
 ///Cause a programmatic breakpoint if breakpoints are enabled.
 #define BNCLogBreakPoint() \
     do  { \
         if (BNCLogBreakPointsAreEnabled()) { \
-            BNCLogMessageInternal(BNCLogLevelBreakPoint, __FILE__, __LINE__, @"Programmatic breakpoint."); \
+            BNCLogWriteMessageFormat(BNCLogLevelBreakPoint, __FILE__, __LINE__, @"Programmatic breakpoint."); \
             if (BNCDebuggerIsAttached()) { \
                 BNCLogFlushMessages(); \
                 BNCDebugBreakpoint(); \
@@ -171,7 +179,7 @@ extern void BNCLogFlushMessages();
 #define BNCBreakPointWithMessage(...) \
     do  { \
         if (BNCLogBreakPointsAreEnabled() { \
-            BNCLogMessageInternal(BNCLogLevelBreakPoint, __FILE__, __LINE__, __VA_ARGS__); \
+            BNCLogWriteMessageFormat(BNCLogLevelBreakPoint, __FILE__, __LINE__, __VA_ARGS__); \
             if (BNCDebuggerIsAttached()) { \
                 BNCLogFlushMessages(); \
                 BNCDebugBreakpoint(); \
@@ -183,7 +191,7 @@ extern void BNCLogFlushMessages();
 #define BNCLogAssert(condition) \
     do  { \
         if (!(condition)) { \
-            BNCLogMessageInternal(BNCLogLevelAssert, __FILE__, __LINE__, @"(%s) !!!", #condition); \
+            BNCLogWriteMessageFormat(BNCLogLevelAssert, __FILE__, __LINE__, @"(%s) !!!", #condition); \
             if (BNCLogBreakPointsAreEnabled() && BNCDebuggerIsAttached()) { \
                 BNCLogFlushMessages(); \
                 BNCDebugBreakpoint(); \
@@ -197,7 +205,7 @@ extern void BNCLogFlushMessages();
     do  { \
         if (!(condition)) { \
             NSString *m = [NSString stringWithFormat:message, __VA_ARGS__]; \
-            BNCLogMessageInternal(BNCLogLevelAssert, __FILE__, __LINE__, @"(%s) !!! %@", #condition, m); \
+            BNCLogWriteMessageFormat(BNCLogLevelAssert, __FILE__, __LINE__, @"(%s) !!! %@", #condition, m); \
             if (BNCLogBreakPointsAreEnabled() && BNCDebuggerIsAttached()) { \
                 BNCLogFlushMessages(); \
                 BNCDebugBreakpoint(); \

ios/Branch-SDK/Branch-SDK/BNCLog.m

@@ -463,7 +463,7 @@ void BNCLogSetBreakPointsEnabled(BOOL enabled) {
 
 #pragma mark - Log Functions
 
-static BNCLogOutputFunctionPtr bnc_LoggingFunction = BNCLogFunctionOutputToStdOut;
+static BNCLogOutputFunctionPtr bnc_LoggingFunction = nil; // Default to just NSLog output.
 static BNCLogFlushFunctionPtr bnc_LogFlushFunction = BNCLogFlushFileDescriptor;
 
 BNCLogOutputFunctionPtr _Nullable BNCLogOutputFunction() {
@@ -498,7 +498,7 @@ void BNCLogSetFlushFunction(BNCLogFlushFunctionPtr flushFunction) {
 
 static dispatch_queue_t bnc_LogQueue = nil;
 
-void BNCLogMessageInternal(
+void BNCLogWriteMessageFormat(
         BNCLogLevel logLevel,
         const char *_Nullable file,
         int lineNumber,
@@ -551,6 +551,15 @@ void BNCLogMessageInternal(
     }
 }
 
+void BNCLogWriteMessage(
+                           BNCLogLevel logLevel,
+                           NSString *_Nonnull file,
+                           NSUInteger lineNumber,
+                           NSString *_Nonnull message
+                           ) {
+    BNCLogWriteMessageFormat(logLevel, file.UTF8String, (int)lineNumber, @"%@", message);
+}
+
 void BNCLogFlushMessages() {
     if (BNCLogSynchronizeMessages()) {
         dispatch_sync(bnc_LogQueue, ^{

ios/Branch-SDK/Branch-SDK/BNCServerRequestQueue.h

@@ -6,13 +6,12 @@
 //
 //
 
-#import "BNCServerRequest.h"
 
+#import "BNCServerRequest.h"
 @class BranchOpenRequest;
 
-@interface BNCServerRequestQueue : NSObject
 
-@property (nonatomic, readonly) unsigned int size;
+@interface BNCServerRequestQueue : NSObject
 
 - (void)enqueue:(BNCServerRequest *)request;
 - (BNCServerRequest *)dequeue;
@@ -32,4 +31,6 @@
 
 + (id)getInstance;
 
+@property (readonly, assign) NSInteger queueDepth;
+@property (readonly, assign) BOOL isDirty;
 @end