Updates for 0.12.8 release.

sojanpr · sojanpr · commit 42b5817ea301 · 2016-09-13T13:25:52.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.7"
+#define SDK_VERSION             @"0.12.8"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV
diff --git a/Branch-SDK/Branch-SDK/Branch.m b/Branch-SDK/Branch-SDK/Branch.m
@@ -1361,7 +1361,7 @@ + (NSString *)bundleIdentifier {
 }
 
 + (NSString *)kitDisplayVersion {
-	return @"0.12.7";
+	return @"0.12.8";
 }
 
-@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.7"
+#define SDK_VERSION             @"0.12.8"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV
diff --git a/Branch.framework/Versions/A/Headers/BNCPreferenceHelper.h b/Branch.framework/Versions/A/Headers/BNCPreferenceHelper.h
@@ -35,6 +35,7 @@
 @property (assign, nonatomic) NSTimeInterval retryInterval;
 @property (assign, nonatomic) NSTimeInterval timeout;
 @property (strong, nonatomic) NSString *externalIntentURI;
+@property (strong, nonatomic) NSMutableDictionary *savedAnalyticsData;
 
 + (BNCPreferenceHelper *)preferenceHelper;
 
@@ -68,4 +69,10 @@
 
 - (void)log:(NSString *)filename line:(int)line message:(NSString *)format, ...;
 - (void)logWarning:(NSString *)message;
+
+- (void)saveBranchAnalyticsData:(NSDictionary *)analyticsData;
+- (void)clearBranchAnalyticsData;
+- (NSMutableDictionary *)getBranchAnalyticsData;
+- (NSDictionary *)getContentAnalyticsManifest;
+- (void)saveContentAnalyticsManifest:(NSDictionary *)cdManifest;
 @end
diff --git a/Branch.framework/Versions/A/Headers/Branch.h b/Branch.framework/Versions/A/Headers/Branch.h
@@ -460,6 +460,14 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  */
 - (void)setRequestMetadataKey:(NSString *)key value:(NSObject *)value;
 
+- (void)enableDelayedInit;
+
+- (void)disableDelayedInit;
+
+- (NSURL *)getUrlForOnboardingWithRedirectUrl:(NSString *)redirectUrl;
+
+- (void)resumeInit;
+
 #pragma mark - Session Item methods
 
 ///--------------------
diff --git a/Branch.framework/Versions/A/Headers/BranchUniversalObject.h b/Branch.framework/Versions/A/Headers/BranchUniversalObject.h
@@ -11,7 +11,8 @@
 
 @class BranchLinkProperties;
 
-typedef void (^shareCompletion) (NSString *_Nonnull activityType, BOOL completed);
+typedef void (^shareCompletion) (NSString * _Nullable activityType, BOOL completed);
+typedef void (^shareCompletionWithError) (NSString * _Nullable activityType, BOOL completed, NSError * _Nullable activityError);
 
 typedef NS_ENUM(NSInteger, ContentIndexMode) {
     ContentIndexModePublic,
@@ -20,51 +21,55 @@ typedef NS_ENUM(NSInteger, ContentIndexMode) {
 
 @interface BranchUniversalObject : NSObject
 
-@property (nonatomic, strong) NSString *canonicalIdentifier;
-@property (nonatomic, strong) NSString *canonicalUrl;
-@property (nonatomic, strong) NSString *title;
-@property (nonatomic, strong) NSString *contentDescription;
-@property (nonatomic, strong) NSString *imageUrl;
+@property (nonatomic, strong, nonnull) NSString *canonicalIdentifier;
+@property (nonatomic, strong, nullable) NSString *canonicalUrl;
+@property (nonatomic, strong, nullable) NSString *title;
+@property (nonatomic, strong, nullable) NSString *contentDescription;
+@property (nonatomic, strong, nullable) NSString *imageUrl;
 // Note: properties found in metadata will overwrite properties on the BranchUniversalObject itself
-@property (nonatomic, strong) NSDictionary *metadata;
-@property (nonatomic, strong) NSString *type;
+@property (nonatomic, strong, nullable) NSDictionary *metadata;
+@property (nonatomic, strong, nullable) NSString *type;
 @property (nonatomic) ContentIndexMode contentIndexMode;
-@property (nonatomic, strong) NSArray *keywords;
-@property (nonatomic, strong) NSDate *expirationDate;
-@property (nonatomic, strong) NSString *spotlightIdentifier;
+@property (nonatomic, strong, nullable) NSArray *keywords;
+@property (nonatomic, strong, nullable) NSDate *expirationDate;
+@property (nonatomic, strong, nullable) NSString *spotlightIdentifier;
 @property (nonatomic, assign) CGFloat price;
-@property (nonatomic, strong) NSString *currency;
+@property (nonatomic, strong, nullable) NSString *currency;
 @property (nonatomic, assign) BOOL automaticallyListOnSpotlight;
 
 
-- (instancetype)initWithCanonicalIdentifier:(NSString *)canonicalIdentifier;
-- (instancetype)initWithTitle:(NSString *)title;
+- (nullable instancetype)initWithCanonicalIdentifier:(nonnull NSString *)canonicalIdentifier;
+- (nullable instancetype)initWithTitle:(nonnull NSString *)title;
 
-- (void)addMetadataKey:(NSString *)key value:(NSString *)value;
+- (void)addMetadataKey:(nonnull NSString *)key value:(nonnull NSString *)value;
 
 - (void)registerView;
-- (void)registerViewWithCallback:(callbackWithParams)callback;
+- (void)registerViewWithCallback:(nullable callbackWithParams)callback;
 
-- (void)userCompletedAction:(NSString *)action;
+- (void)userCompletedAction:(nonnull NSString *)action;
 
-- (NSString *)getShortUrlWithLinkProperties:(BranchLinkProperties *)linkProperties;
-- (NSString *)getShortUrlWithLinkPropertiesAndIgnoreFirstClick:(BranchLinkProperties *)linkProperties;
-- (void)getShortUrlWithLinkProperties:(BranchLinkProperties *)linkProperties andCallback:(callbackWithUrl)callback;
+- (nullable NSString *)getShortUrlWithLinkProperties:(nonnull BranchLinkProperties *)linkProperties;
+- (nullable NSString *)getShortUrlWithLinkPropertiesAndIgnoreFirstClick:(nonnull BranchLinkProperties *)linkProperties;
+- (void)getShortUrlWithLinkProperties:(nonnull BranchLinkProperties *)linkProperties andCallback:(nonnull callbackWithUrl)callback;
 
-- (UIActivityItemProvider *)getBranchActivityItemWithLinkProperties:(BranchLinkProperties *)linkProperties;
+- (nullable UIActivityItemProvider *)getBranchActivityItemWithLinkProperties:(nonnull BranchLinkProperties *)linkProperties;
 
-- (void)showShareSheetWithShareText:(NSString *)shareText completion:(shareCompletion)completion;
-- (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties andShareText:(NSString *)shareText fromViewController:(UIViewController *)viewController completion:(shareCompletion)completion;
+- (void)showShareSheetWithShareText:(nullable NSString *)shareText completion:(nullable shareCompletion)completion;
+- (void)showShareSheetWithLinkProperties:(nullable BranchLinkProperties *)linkProperties andShareText:(nullable NSString *)shareText fromViewController:(nullable UIViewController *)viewController completion:(nullable shareCompletion)completion;
+// Returns with activityError as well
+- (void)showShareSheetWithLinkProperties:(nullable BranchLinkProperties *)linkProperties andShareText:(nullable NSString *)shareText fromViewController:(nullable UIViewController *)viewController completionWithError:(nullable shareCompletionWithError)completion;
 //iPad
-- (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties andShareText:(NSString *)shareText fromViewController:(UIViewController *)viewController anchor:(UIBarButtonItem *)anchor completion:(shareCompletion)completion;
+- (void)showShareSheetWithLinkProperties:(nullable BranchLinkProperties *)linkProperties andShareText:(nullable NSString *)shareText fromViewController:(nullable UIViewController *)viewController anchor:(nullable UIBarButtonItem *)anchor completion:(nullable shareCompletion)completion;
+// Returns with activityError as well
+- (void)showShareSheetWithLinkProperties:(nullable BranchLinkProperties *)linkProperties andShareText:(nullable NSString *)shareText fromViewController:(nullable UIViewController *)viewController anchor:(nullable UIBarButtonItem *)anchor completionWithError:(nullable shareCompletionWithError)completion;
 
 - (void)listOnSpotlight;
-- (void)listOnSpotlightWithCallback:(callbackWithUrl)callback;
-- (void)listOnSpotlightWithIdentifierCallback:(callbackWithUrlAndSpotlightIdentifier)spotlightCallback __attribute__((deprecated(("iOS 10 has changed how Spotlight indexing works and we’ve updated the SDK to reflect this. Please see https://dev.branch.io/features/spotlight-indexing/overview/ for instructions on migration"))));;
+- (void)listOnSpotlightWithCallback:(nullable callbackWithUrl)callback;
+- (void)listOnSpotlightWithIdentifierCallback:(nullable callbackWithUrlAndSpotlightIdentifier)spotlightCallback __attribute__((deprecated(("iOS 10 has changed how Spotlight indexing works and we’ve updated the SDK to reflect this. Please see https://dev.branch.io/features/spotlight-indexing/overview/ for instructions on migration"))));;
 
 // Convenience method for initSession methods that return BranchUniversalObject, but can be used safely by anyone.
-+ (BranchUniversalObject *)getBranchUniversalObjectFromDictionary:(NSDictionary *)dictionary;
++ (nonnull BranchUniversalObject *)getBranchUniversalObjectFromDictionary:(nonnull NSDictionary *)dictionary;
 
-- (NSString *)description;
+- (nonnull NSString *)description;
 
 @end
diff --git a/Branch.podspec b/Branch.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Branch"
-  s.version          = "0.12.7"
+  s.version          = "0.12.8"
   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.8
+  * Changes for supporting latest xcode updates
+  * Content Discovery feature
+  * Fix for an iOS 7 crash issue
+
 - v0.12.7
   * iOS 10 Spotlight indexing support
   * iMessage extensions support for deep linking and BUO

Original file line number	Diff line number	Diff line change
`@@ -1361,7 +1361,7 @@ + (NSString *)bundleIdentifier {`
`1361`	`1361`	`}`
`1362`	`1362`
`1363`	`1363`	`+ (NSString *)kitDisplayVersion {`
`1364`		`- return @"0.12.7";`
	`1364`	`+ return @"0.12.8";`
`1365`	`1365`	`}`
`1366`	`1366`
`1367`		`-@end`
	`1367`	`+@end`