Updates for 0.12.4 release.

ahmednawar · ahmednawar · commit c5275be3d87e · 2016-07-14T22:55:33.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.3"
+#define SDK_VERSION             @"0.12.4"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV
diff --git a/Branch-SDK/Branch-SDK/Branch.m b/Branch-SDK/Branch-SDK/Branch.m
@@ -1284,7 +1284,7 @@ + (NSString *)bundleIdentifier {
 }
 
 + (NSString *)kitDisplayVersion {
-    return @"0.12.0";
+	return @"0.12.4";
 }
 
-@end
+@end
diff --git a/Branch-TestBed/Branch-TestBed/Branch-TestBed-Info.plist b/Branch-TestBed/Branch-TestBed/Branch-TestBed-Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.12.0</string>
+	<string>0.12.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
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.3"
+#define SDK_VERSION             @"0.12.4"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV
@@ -20,7 +20,7 @@
 #endif
 
 #ifdef BNC_STAGE_ENV
-#define BNC_API_BASE_URL        @"http://api.dev.branchmetrics.io"
+#define BNC_API_BASE_URL        @"http://api.dev.branch.io"
 #endif
 
 #define BNC_LINK_URL             @"https://bnc.lt"
diff --git a/Branch.framework/Versions/A/Headers/BNCPreferenceHelper.h b/Branch.framework/Versions/A/Headers/BNCPreferenceHelper.h
@@ -14,7 +14,6 @@
 @interface BNCPreferenceHelper : NSObject
 
 @property (strong, nonatomic) NSString *branchKey;
-@property (strong, nonatomic) NSString *appKey;
 @property (strong, nonatomic) NSString *lastRunBranchKey;
 @property (strong, nonatomic) NSDate *lastStrongMatchDate;
 @property (strong, nonatomic) NSString *appVersion;
@@ -28,8 +27,6 @@
 @property (strong, nonatomic) NSString *userIdentity;
 @property (strong, nonatomic) NSString *sessionParams;
 @property (strong, nonatomic) NSString *installParams;
-@property (assign, nonatomic) BOOL explicitlyRequestedReferrable;
-@property (assign, nonatomic) BOOL isReferrable;
 @property (assign, nonatomic) BOOL isDebug;
 @property (assign, nonatomic) BOOL shouldWaitForInit;
 @property (assign, nonatomic) BOOL suppressWarningLogs;
@@ -43,6 +40,8 @@
 
 - (NSString *)getAPIBaseURL;
 - (NSString *)getAPIURL:(NSString *)endpoint;
+- (NSString *)getEndpointFromURL:(NSString *)url;
+
 - (NSString *)getBranchKey:(BOOL)isLive;
 
 - (void)clearUserCreditsAndCounts;
@@ -57,17 +56,16 @@
 - (NSInteger)getCreditCount;
 - (NSInteger)getCreditCountForBucket:(NSString *)bucket;
 
-- (void)setActionTotalCount:(NSString *)action withCount:(NSInteger)count;
-- (void)setActionUniqueCount:(NSString *)action withCount:(NSInteger)count;
-- (NSInteger)getActionTotalCount:(NSString *)action;
-- (NSInteger)getActionUniqueCount:(NSString *)action;
-
 - (void)updateBranchViewCount:(NSString *)branchViewID;
 - (NSInteger)getBranchViewCount:(NSString *)branchViewID;
 
 - (void)setRequestMetadataKey:(NSString *)key value:(NSObject *)value;
 - (NSMutableDictionary *)requestMetadataDictionary;
 
+- (void)addInstrumentationDictionaryKey:(NSString *)key value:(NSString *)value;
+- (NSMutableDictionary *)instrumentationDictionary;
+- (void)clearInstrumentationDictionary;
+
 - (void)log:(NSString *)filename line:(int)line message:(NSString *)format, ...;
 - (void)logWarning:(NSString *)message;
 @end
diff --git a/Branch.framework/Versions/A/Headers/BNCServerInterface.h b/Branch.framework/Versions/A/Headers/BNCServerInterface.h
@@ -12,11 +12,6 @@
 
 typedef void (^BNCServerCallback)(BNCServerResponse *response, NSError *error);
 
-static NSString *REQ_TAG_DEBUG_CONNECT = @"t_debug_connect";
-static NSString *REQ_TAG_DEBUG_LOG = @"t_debug_log";
-static NSString *REQ_TAG_DEBUG_SCREEN = @"t_debug_screen";
-static NSString *REQ_TAG_DEBUG_DISCONNECT = @"t_debug_disconnect";
-
 @interface BNCServerInterface : NSObject
 
 @property (strong, nonatomic) BNCPreferenceHelper *preferenceHelper;
diff --git a/Branch.framework/Versions/A/Headers/Branch.h b/Branch.framework/Versions/A/Headers/Branch.h
diff --git a/Branch.framework/Versions/A/Headers/BranchUniversalObject.h b/Branch.framework/Versions/A/Headers/BranchUniversalObject.h
@@ -48,8 +48,6 @@ typedef NS_ENUM(NSInteger, ContentIndexMode) {
 
 - (UIActivityItemProvider *)getBranchActivityItemWithLinkProperties:(BranchLinkProperties *)linkProperties;
 
-- (void)showShareSheetWithShareText:(NSString *)shareText andCallback:(callback)callback __attribute__((deprecated(("This method has been deprecated. Use -[showShareSheetWithShareText:completion:] instead."))));
-- (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties andShareText:(NSString *)shareText fromViewController:(UIViewController *)viewController andCallback:(callback)callback __attribute__((deprecated(("This method has been deprecated. Use -[showShareSheetWithLinkProperties:andShareText:fromViewController:viewController:completion:] instead."))));
 - (void)showShareSheetWithShareText:(NSString *)shareText completion:(shareCompletion)completion;
 - (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties andShareText:(NSString *)shareText fromViewController:(UIViewController *)viewController completion:(shareCompletion)completion;
 //iPad
diff --git a/Branch.podspec b/Branch.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Branch"
-  s.version          = "0.12.3"
+  s.version          = "0.12.4"
   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?
@@ -16,8 +16,6 @@ Use the Branch SDK (branch.io) to create and power the links that point back to
   s.license          = 'Proprietary'
   s.author           = { "Branch" => "support@branch.io" }
   s.source           = { :git => "https://github.com/BranchMetrics/iOS-Deferred-Deep-Linking-SDK.git", :tag => s.version.to_s }
-  s.social_media_url = 'https://www.linkedin.com/company/3813083'
-
   s.platform     = :ios, '6.0'
   s.requires_arc = true
 
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,12 +1,14 @@
 Branch iOS SDK change log
 
-- v0.12.4 (WIP)
+- v0.12.4 
   * setDebug must be called on getInstance. It's no longer a static method.
   * referral code and promo code methods are no longer available
   * action count methods are no longer available
   * getReferralUrl removed - please migrate to BUO
   * getContentUrl removed - please migrate to BUO
   * BUO showShareSheet andCallback method deprecated - migrate to showShareSheet callback.
+  * App ID removed - please migrate to using Branch Key
+  * Handle iOS 10 returning all-zeros IDFA when limiting ad tracking
 
 - v0.12.3
   * Fabric Answers integration

Original file line number	Diff line number	Diff line change
`@@ -1284,7 +1284,7 @@ + (NSString *)bundleIdentifier {`
`1284`	`1284`	`}`
`1285`	`1285`
`1286`	`1286`	`+ (NSString *)kitDisplayVersion {`
`1287`		`- return @"0.12.0";`
	`1287`	`+ return @"0.12.4";`
`1288`	`1288`	`}`
`1289`	`1289`
`1290`		`-@end`
	`1290`	`+@end`