Release 3.4.0

Author: nsingh-branch

Branch-TestBed/Branch-SDK-Tests/NSMutableDictionaryBranchTests.m

@@ -363,24 +363,27 @@ - (void)testGetBooleanForKey {
         @"bool2" : @(0),
         @"bool3" : @"1", // valid bool
         @"bool4" : @"0", // valid bool
-        @"bool5" : @"YES", // invalid bool, server expects a number. treated as false
-        @"bool6" : @"NO", // invalid bool, server expects a number. treated as false
+        @"bool5" : @"YES",
+        @"bool6" : @"NO",
         @"bool7" : @(-1), // all non-zero numbers are true
         @"bool8" : @(1234), // all non-zero numbers are true
-        @"bool9" : @[ ] // invalid bool, treated as false
-
+        @"bool9" : @[ ], // invalid bool, treated as false
+        @"bool10": @"true",
+        @"bool11": @"false"
     };
     NSMutableDictionary *dict = [tmp mutableCopy];
 
     XCTAssertTrue([dict bnc_getBooleanForKey:@"bool1"]);
     XCTAssertFalse([dict bnc_getBooleanForKey:@"bool2"]);
     XCTAssertTrue([dict bnc_getBooleanForKey:@"bool3"]);
     XCTAssertFalse([dict bnc_getBooleanForKey:@"bool4"]);
-    XCTAssertFalse([dict bnc_getBooleanForKey:@"bool5"]);
+    XCTAssertTrue([dict bnc_getBooleanForKey:@"bool5"]);
     XCTAssertFalse([dict bnc_getBooleanForKey:@"bool6"]);
     XCTAssertTrue([dict bnc_getBooleanForKey:@"bool7"]);
     XCTAssertTrue([dict bnc_getBooleanForKey:@"bool8"]);
     XCTAssertFalse([dict bnc_getBooleanForKey:@"bool9"]);
+    XCTAssertTrue([dict bnc_getBooleanForKey:@"bool10"]);
+    XCTAssertFalse([dict bnc_getBooleanForKey:@"bool11"]);
 }
 
 @end

BranchSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "BranchSDK"
-  s.version          = "3.3.0"
+  s.version          = "3.4.0"
   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?

BranchSDK.xcodeproj/project.pbxproj

@@ -1974,7 +1974,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.4.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2009,7 +2009,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.4.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2215,7 +2215,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.4.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2254,7 +2254,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.4.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2291,7 +2291,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.4.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2326,7 +2326,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.3.0;
+				MARKETING_VERSION = 3.4.0;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,

ChangeLog.md

@@ -1,5 +1,8 @@
 Branch iOS SDK Change Log
 
+v.3.4.0
+- Added support for setting the Branch API base URL through the `branch.json` file.
+
 v.3.3.0
 - SDK behavior change to fix a race condition when opening a closed app with a link. In some apps, this race condition could cause the occasional loss of link data.
 

Sources/BranchSDK/BNCConfig.m

@@ -8,7 +8,7 @@
 
 #include "BNCConfig.h"
 
-NSString * const BNC_SDK_VERSION  = @"3.3.0";
+NSString * const BNC_SDK_VERSION  = @"3.4.0";
 NSString * const BNC_LINK_URL = @"https://bnc.lt";
 NSString * const BNC_CDN_URL = @"https://cdn.branch.io";
 

Sources/BranchSDK/Branch.m

@@ -235,6 +235,10 @@ - (id)initWithInterface:(BNCServerInterface *)interface
     BranchJsonConfig *config = BranchJsonConfig.instance;
     self.deferInitForPluginRuntime = config.deferInitForPluginRuntime;
 
+    if (config.apiUrl) {
+        [Branch setAPIUrl:config.apiUrl];
+    }
+    
     if (config.enableLogging) {
         [self enableLogging];
     }

Sources/BranchSDK/BranchJsonConfig.m

@@ -17,6 +17,8 @@
 NSString * _Nonnull const BranchJsonConfigDeferInitForPluginRuntimeOption = @"deferInitForPluginRuntime";
 NSString * _Nonnull const BranchJsonConfigEnableLogging = @"enableLogging";
 NSString * _Nonnull const BranchJsonConfigCheckPasteboardOnInstall = @"checkPasteboardOnInstall";
+NSString * _Nonnull const BranchJsonConfigAPIUrl = @"apiUrl";
+
 
 @interface BranchJsonConfig()
 @property (nonatomic, strong) NSDictionary *configuration;
@@ -161,6 +163,11 @@ - (NSString *)testKey
     return self[BranchJsonConfigTestKeyOption];
 }
 
+- (NSString *)apiUrl
+{
+    return self[BranchJsonConfigAPIUrl];
+}
+
 - (id)objectForKey:(NSString *)key
 {
     return self.configuration[key];

Sources/BranchSDK/NSMutableDictionary+Branch.m

@@ -192,7 +192,7 @@ - (BOOL)bnc_getBooleanForKey:(NSString *)key {
         returnValue = [number boolValue];
     } else if ([tmp isKindOfClass:[NSString class]]) {
         NSString *numberAsString = (NSString *)tmp;
-        returnValue = [numberAsString doubleValue];
+        returnValue = [numberAsString boolValue];
     }
 
     return returnValue;

Sources/BranchSDK/Private/BranchJsonConfig.h

@@ -16,6 +16,7 @@ extern NSString * _Nonnull const BranchJsonConfigUseTestInstanceOption;
 extern NSString * _Nonnull const BranchJsonConfigDeferInitForPluginRuntimeOption;
 extern NSString * _Nonnull const BranchJsonConfigEnableLogging;
 extern NSString * _Nonnull const BranchJsonConfigCheckPasteboardOnInstall;
+extern NSString * _Nonnull const BranchJsonConfigAPIUrl;
 
 @interface BranchJsonConfig : NSObject
 
@@ -29,6 +30,7 @@ extern NSString * _Nonnull const BranchJsonConfigCheckPasteboardOnInstall;
 @property (nonatomic, readonly, assign) BOOL deferInitForPluginRuntime;
 @property (nonatomic, readonly, assign) BOOL enableLogging;
 @property (nonatomic, readonly, assign) BOOL checkPasteboardOnInstall;
+@property (nonatomic, readonly, nullable, copy) NSString *apiUrl;
 
 - (nullable id)objectForKey:(NSString * _Nonnull)key;
 - (nullable id)objectForKeyedSubscript:(NSString * _Nonnull)key;

scripts/version.sh

@@ -30,7 +30,7 @@ Options:
 USAGE
 }
 
-version=3.3.0
+version=3.4.0
 prev_version="$version"
 
 if (( $# == 0 )); then