Merge branch 'master' into staging

sojanpr · sojanpr · commit 51170897fa62 · 2016-09-16T00:08:49.000-07:00
diff --git a/Branch-SDK/Branch-SDK/BNCConfig.h b/Branch-SDK/Branch-SDK/BNCConfig.h
@@ -9,7 +9,7 @@
 #ifndef Branch_SDK_Config_h
 #define Branch_SDK_Config_h
 
-#define SDK_VERSION             @"0.12.9"
+#define SDK_VERSION             @"0.12.10"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV
diff --git a/Branch-SDK/Branch-SDK/Branch.m b/Branch-SDK/Branch-SDK/Branch.m
@@ -1364,7 +1364,7 @@ + (NSString *)bundleIdentifier {
 }
 
 + (NSString *)kitDisplayVersion {
-	return @"0.12.9";
+	return @"0.12.10";
 }
 
-@end
+@end
diff --git a/Branch.framework/Versions/A/Branch b/Branch.framework/Versions/A/Branch
diff --git a/Branch.framework/Versions/A/Headers/BNCConfig.h b/Branch.framework/Versions/A/Headers/BNCConfig.h
@@ -9,7 +9,7 @@
 #ifndef Branch_SDK_Config_h
 #define Branch_SDK_Config_h
 
-#define SDK_VERSION             @"0.12.9"
+#define SDK_VERSION             @"0.12.10"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV
diff --git a/Branch.framework/Versions/A/Headers/BranchUniversalObject.h b/Branch.framework/Versions/A/Headers/BranchUniversalObject.h
@@ -38,8 +38,8 @@ typedef NS_ENUM(NSInteger, ContentIndexMode) {
 @property (nonatomic, assign) BOOL automaticallyListOnSpotlight;
 
 
-- (nullable instancetype)initWithCanonicalIdentifier:(nonnull NSString *)canonicalIdentifier;
-- (nullable instancetype)initWithTitle:(nonnull NSString *)title;
+- (nonnull instancetype)initWithCanonicalIdentifier:(nonnull NSString *)canonicalIdentifier;
+- (nonnull instancetype)initWithTitle:(nonnull NSString *)title;
 
 - (void)addMetadataKey:(nonnull NSString *)key value:(nonnull NSString *)value;
 
diff --git a/Branch.podspec b/Branch.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Branch"
-  s.version          = "0.12.9"
+  s.version          = "0.12.10"
   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?
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,10 @@
 Branch iOS SDK change log
 
+- v0.12.10
+  * Fix for issue causing initsession hang on cold start from universal link
+  * Adding few crash protection
+  * Removing BUO nullable fields  
+
 - v0.12.9
   * Fixing the time delay for strong match check using SVC
 
diff --git a/checksum b/checksum
@@ -1,4 +1,4 @@
 #checksum for Branch-iOS-SDK found at https://s3-us-west-1.amazonaws.com/branchhost/Branch-iOS-SDK.zip
-402e2bab08a16dd030a9deb5ae18aa287af56a80  Branch-iOS-SDK.zip
+55426a2a9b67662e146962446af140f1164f6fcb  Branch-iOS-SDK.zip
 #checksum for Branch-iOS-TestBed found at https://s3-us-west-1.amazonaws.com/branchhost/Branch-iOS-TestBed.zip
-427b242273ce25786233b6a7c1501bd3459fe5bc  Branch-iOS-TestBed.zip
+7655eead75ae129c361b806830be5f68303eda8b  Branch-iOS-TestBed.zip

Original file line number	Diff line number	Diff line change
`@@ -1364,7 +1364,7 @@ + (NSString *)bundleIdentifier {`
`1364`	`1364`	`}`
`1365`	`1365`
`1366`	`1366`	`+ (NSString *)kitDisplayVersion {`
`1367`		`- return @"0.12.9";`
	`1367`	`+ return @"0.12.10";`
`1368`	`1368`	`}`
`1369`	`1369`
`1370`		`-@end`
	`1370`	`+@end`