Release 0.30.0.

Branch-SDK/Branch-SDK/BNCConfig.m

@@ -12,4 +12,4 @@
 BOOL       const BNC_API_PINNED      = NO;
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"0.29.3";
+NSString * const BNC_SDK_VERSION     = @"0.30.0";

Branch-TestBed-Swift/TestBed-Swift.xcodeproj/project.pbxproj

@@ -670,7 +670,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-TestBed-Swift/Pods-TestBed-Swift-frameworks.sh",
-				"${PODS_ROOT}/Localytics/Localytics-iOS-5.5.0/Localytics.framework",
+				"${PODS_ROOT}/Localytics/Localytics-iOS-5.8.0/Localytics.framework",
 				"${PODS_ROOT}/Tune/Tune.framework",
 				"${PODS_ROOT}/YandexMobileMetrica/dynamic/YandexMobileMetrica.framework",
 				"${PODS_ROOT}/YandexMobileMetrica/dynamic/YandexMobileMetricaCrashes.framework",

Branch-TestBed-Swift/TestBed-Swift/AppDelegate.swift

@@ -12,6 +12,15 @@ import Crashlytics
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate, AdjustDelegate, AppsFlyerTrackerDelegate {
 
+    func onConversionDataSuccess(_ conversionInfo: [AnyHashable : Any]!) {
+
+    }
+
+    func onConversionDataFail(_ error: Error!) {
+
+    }
+
+
     var window: UIWindow?
 
     func application(_

Branch-TestBed/Framework-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.29.3</string>
+	<string>0.30.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.29.3</string>
+	<string>0.30.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>

Branch.framework/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.29.3</string>
+	<string>0.30.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.29.3</string>
+	<string>0.30.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>

Branch.framework/Versions/A/Headers/BNCPreferenceHelper.h

@@ -33,24 +33,25 @@ NSURL* /* _Nonnull */ BNCURLForBranchDirectory(void);
 @property (strong, nonatomic) NSString *sessionParams;
 @property (strong, nonatomic) NSString *installParams;
 @property (assign, nonatomic) BOOL isDebug;
-@property (assign, nonatomic) BOOL shouldWaitForInit;
 @property (assign, nonatomic) BOOL checkedFacebookAppLinks;
 @property (assign, nonatomic) BOOL checkedAppleSearchAdAttribution;
 @property (assign, nonatomic) NSInteger retryCount;
 @property (assign, nonatomic) NSTimeInterval retryInterval;
 @property (assign, nonatomic) NSTimeInterval timeout;
 @property (strong, atomic)    NSString *externalIntentURI;
 @property (strong, nonatomic) NSMutableDictionary *savedAnalyticsData;
-@property (assign, nonatomic) NSInteger installRequestDelay;
 @property (strong, nonatomic) NSDictionary *appleSearchAdDetails;
 @property (assign, nonatomic) BOOL          appleSearchAdNeedsSend;
 @property (strong, nonatomic) NSString *lastSystemBuildVersion;
 @property (strong, nonatomic) NSString *browserUserAgentString;
 @property (strong, atomic) NSString *referringURL;
 @property (strong, atomic) NSString *branchAPIURL;
+@property (nonatomic, strong, readwrite) NSString *branchBlacklistURL;
 @property (assign, atomic) BOOL      limitFacebookTracking;
 @property (strong, atomic) NSDate   *previousAppBuildDate;
 
+@property (strong, nonatomic, readwrite) NSURL *faceBookAppLink;
+
 @property (strong, atomic) NSArray<NSString*> *URLBlackList;
 @property (assign, atomic) NSInteger URLBlackListVersion;
 @property (assign, atomic) BOOL blacklistURLOpen;

Branch.framework/Versions/A/Headers/Branch.h

@@ -18,7 +18,7 @@
 #import "BNCCommerceEvent.h"
 #import "BNCConfig.h"
 #import "BNCDebug.h"
-#import "BNCError.h"
+#import "NSError+Branch.h"
 #import "BNCLinkCache.h"
 #import "BNCLog.h"
 #import "BNCPreferenceHelper.h"
@@ -168,21 +168,21 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
 
  @warning This method is not meant to be used in production!
 */
-+ (nullable Branch *) getTestInstance __attribute__((deprecated(("Use `Branch.useTestBranchKey = YES;` instead."))));
++ (Branch *)getTestInstance __attribute__((deprecated(("Use `Branch.useTestBranchKey = YES;` instead."))));
 
 
 /**
  Gets the global, live Branch instance.
  */
-+ (nullable Branch *)getInstance;
++ (Branch *)getInstance;
 
 /**
  Gets the global Branch instance, configures using the specified key
 
  @param branchKey The Branch key to be used by the Branch instance. This can be any live or test key.
  @warning This method is not the recommended way of using Branch. Try using your project's `Info.plist` if possible.
  */
-+ (nullable Branch *)getInstance:(NSString *)branchKey;
++ (Branch *)getInstance:(NSString *)branchKey;
 
 /**
  Set the network service class.
@@ -624,10 +624,27 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
 - (void)registerFacebookDeepLinkingClass:(id)FBSDKAppLinkUtility;
 
 /**
- Check for Apple Search Ads before initialization. Will add about 1 second from call to initSession to callback due to Apple's latency.
+ Check for Apple Search Ads before initialization.
+ 
+ This will usually add less than 1 second on first time startup.  Up to 3.5 seconds if Apple Search Ads fails to respond.
  */
 - (void)delayInitToCheckForSearchAds;
 
+/**
+ Increases the amount of time the SDK waits for Apple Search Ads to respond.
+ The default wait has a better than 90% success rate, however waiting longer can improve the success rate.
+
+ This will increase the usual delay to about 3 seconds on first time startup.  Up to about 15 seconds if Apple Search Ads fails to respond.
+ */
+- (void)useLongerWaitForAppleSearchAds;
+
+/**
+ Ignores Apple Search Ads test data.
+ 
+ Apple returns test data for all calls made to the Apple Search Ads API on developer and testflight builds.
+ */
+- (void)ignoreAppleSearchAdsTestData;
+
 /**
  Specify the time to wait in seconds between retries in the case of a Branch server error
 
@@ -653,7 +670,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  Specify that Branch should NOT use an invisible SFSafariViewController to attempt cookie-based matching upon install.
  If you call this method, we will fall back to using our pool of cookie-IDFA pairs for matching.
  */
-- (void)disableCookieBasedMatching;
+- (void)disableCookieBasedMatching __attribute__((deprecated(("Feature removed.  Did not work on iOS 11+"))));
 
 /**
  TL;DR: If you're using a version of the Facebook SDK that prevents application:didFinishLaunchingWithOptions: from
@@ -681,15 +698,15 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  */
 - (void)setRequestMetadataKey:(NSString *)key value:(nullable id)value;
 
-- (void)enableDelayedInit;
+- (void)enableDelayedInit __attribute__((deprecated(("No longer valid with new init process"))));
 
-- (void)disableDelayedInit;
+- (void)disableDelayedInit __attribute__((deprecated(("No longer valid with new init process"))));
 
-- (nullable NSURL *)getUrlForOnboardingWithRedirectUrl:(nullable NSString *)redirectUrl;
+- (nullable NSURL *)getUrlForOnboardingWithRedirectUrl:(nullable NSString *)redirectUrl __attribute__((deprecated(("Feature removed.  Did not work on iOS 11+"))));;
 
-- (void)resumeInit;
+- (void)resumeInit __attribute__((deprecated(("Feature removed.  Did not work on iOS 11+"))));
 
-- (void)setInstallRequestDelay:(NSInteger)installRequestDelay;
+- (void)setInstallRequestDelay:(NSInteger)installRequestDelay __attribute__((deprecated(("No longer valid with new init process"))));
 
 /**
  Disables the Branch SDK from tracking the user. This is useful for GDPR privacy compliance.
@@ -947,14 +964,26 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  */
 - (void) sendCommerceEvent:(BNCCommerceEvent*)commerceEvent
 				  metadata:(NSDictionary<NSString*,id>*)metadata
-			withCompletion:(void (^) (NSDictionary*response, NSError*error))completion __attribute__((deprecated(("Please use BranchEvent to track commerce events."))));
+			withCompletion:(void (^) (NSDictionary* _Nullable response, NSError* _Nullable error))completion __attribute__((deprecated(("Please use BranchEvent to track commerce events."))));
 
 
 #pragma mark - Query methods
 
+/**
+ Branch includes SDK methods to allow retrieval of our Cross Platform ID (CPID) from the client. This results in an asynchronous call being made to Branch’s servers with CPID data returned when possible.
+ 
+ @param completion callback with cross platform id data
+ */
 - (void)crossPlatformIdDataWithCompletion:(void(^) (BranchCrossPlatformID * _Nullable cpid))completion;
 
-- (void)lastTouchAttributedDataWithCompletion:(void(^) (BranchLastAttributedTouchData * _Nullable ltad))completion;
+/**
+ Branch includes SDK methods to allow retrieval of our last attributed touch data (LATD) from the client. This results in an asynchronous call being made to Branch's servers with LATD data returned when possible.
+ Last attributed touch data contains the information associated with that user's last viewed impression or clicked link.
+ 
+ @param window attribution window in days.  If the window is outside the server supported range, it will default to 30 days.
+ @param completion callback with attribution data
+ */
+- (void)lastAttributedTouchDataWithAttributionWindow:(NSInteger)window completion:(void(^) (BranchLastAttributedTouchData * _Nullable latd))completion;
 
 #pragma mark - Short Url Sync methods
 

Branch.framework/Versions/A/Headers/BranchCrossPlatformID.h

@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy, readonly) NSString *crossPlatformID;
 @property (nonatomic, copy, readonly) NSNumber *score;
 
-+ (BranchProbabilisticCrossPlatformID *)buildFromJSON:(NSDictionary *)json;
++ (nullable BranchProbabilisticCrossPlatformID *)buildFromJSON:(NSDictionary *)json;
 
 @end
 
@@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, readonly) NSArray<NSString *> *pastCrossPlatformIDs;
 @property (nonatomic, strong, readonly) NSArray<BranchProbabilisticCrossPlatformID *> *probabiliticCrossPlatformIDs;
 
-+ (BranchCrossPlatformID *)buildFromJSON:(NSDictionary *)json;
++ (nullable BranchCrossPlatformID *)buildFromJSON:(NSDictionary *)json;
 
 + (void)requestCrossPlatformIdData:(BNCServerInterface *)serverInterface key:(NSString *)key completion:(void(^) (BranchCrossPlatformID * _Nullable cpid))completion;
 

Branch.framework/Versions/A/Headers/BranchLastAttributedTouchData.h

@@ -18,9 +18,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, copy, readonly) NSNumber *attributionWindow;
 
-+ (BranchLastAttributedTouchData *)buildFromJSON:(NSDictionary *)json;
++ (nullable BranchLastAttributedTouchData *)buildFromJSON:(NSDictionary *)json;
 
-+ (void)requestLastTouchAttributedData:(BNCServerInterface *)serverInterface key:(NSString *)key completion:(void(^) (BranchLastAttributedTouchData *latd))completion;
++ (void)requestLastTouchAttributedData:(BNCServerInterface *)serverInterface key:(NSString *)key attributionWindow:(NSInteger)window completion:(void(^) (BranchLastAttributedTouchData *latd))completion;
 
 @end
 

Branch.podspec

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

ChangeLog.md

@@ -5,8 +5,8 @@ Branch iOS SDK Change Log
   * SDK-513 update Apple Search Ads behavior and API
   * SDK-614 last attributed touch API now accepts attribution window
   * SDK-605 add blacklist url configuration
-  * SDK-608 remove deprecated Safari cookie integration
-  * SDK-598 fix race condition on SDK init
+  * SDK-608 remove deprecated Safari cookie matching
+  * SDK-598 fix potential race condition on SDK init
   * SDK-603 fix Carthage build from source
   * SDK-554 fix Swift getInstance nullability
   * SDK-450 fix object serialization error

carthage-files/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.29.3</string>
+	<string>0.30.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.29.3</string>
+	<string>0.30.0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

checksum

@@ -1,4 +1,4 @@
 #checksum for Branch-iOS-SDK found at https://s3-us-west-1.amazonaws.com/branchhost/Branch-iOS-SDK.zip
-900fbea348a2c7f9bad0528f32f3fe9103b768a4  Branch-iOS-SDK.zip
+879ae2a3fd32caa8fa88c273aed90f2f8794891d  Branch-iOS-SDK.zip
 #checksum for Branch-iOS-TestBed found at https://s3-us-west-1.amazonaws.com/branchhost/Branch-iOS-TestBed.zip
-c43fe88d43890e12a7de6cf3238d684b54c08b2e  Branch-iOS-TestBed.zip
+47478e6688aed474375b0cb51b9b6b23288f9d09  Branch-iOS-TestBed.zip

scripts/deploy-release

@@ -44,8 +44,7 @@ nano ChangeLog.md
 # Pre-release CocoaPod lint
 echo ">>> Linting build for release..." 1>&2
 
-# allowing warnings until nullability warnings are fixed with SDK-518
-pod lib lint Branch.podspec --verbose --allow-warnings
+pod lib lint Branch.podspec --verbose
 
 # Build the framework
 echo ">>> Building the framework..." 1>&2

scripts/version

@@ -31,7 +31,7 @@ Options:
 USAGE
 }
 
-version=0.29.3
+version=0.30.0
 
 if (( $# == 0 )); then
     echo $version