Merge branch 'staging2' into staging

Branch-SDK/BNCConfig.m

@@ -11,4 +11,4 @@
 NSString * const BNC_API_BASE_URL    = @"https://api2.branch.io";
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"1.39.2";
+NSString * const BNC_SDK_VERSION     = @"1.39.3";

Branch-TestBed/Framework-Info.plist

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

Branch.podspec

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

@@ -1,5 +1,8 @@
 Branch iOS SDK Change Log
 
+v1.39.3
+CORE-1893 Add timeout to Apple attribution token. Some users are reporting the call can hang.
+
 v1.39.2
 CORE-1768 Add 'handleATTAuthorizationStatus' method to monitor ATT prompt performance.
 

carthage-files/BranchSDK.xcodeproj/project.pbxproj

@@ -1589,7 +1589,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.39.2;
+				MARKETING_VERSION = 1.39.3;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1629,7 +1629,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.39.2;
+				MARKETING_VERSION = 1.39.3;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1665,7 +1665,7 @@
 				);
 				MACH_O_TYPE = staticlib;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.39.2;
+				MARKETING_VERSION = 1.39.3;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1698,7 +1698,7 @@
 				);
 				MACH_O_TYPE = staticlib;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.39.2;
+				MARKETING_VERSION = 1.39.3;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1857,7 +1857,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.39.2;
+				MARKETING_VERSION = 1.39.3;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1888,7 +1888,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.39.2;
+				MARKETING_VERSION = 1.39.3;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;

carthage-files/checksum

@@ -1,2 +1,2 @@
 #checksum for Branch.zip on Github
-72856d328e01326162ea7c4379dc9b284dc1f15a  Branch.zip
+b325b48cdcc2a6b7e9c0fdda22d911d1423812dd  Branch.zip

carthage-files/checksum_static

@@ -1,2 +1,2 @@
 #checksum for Branch_static.zip on Github
-9057c3164cbf54ca8be346169b7dc5726576a3ae  Branch_static.zip
+fc80baaaa34dab5dcc2eb7c55df8f2f433d71de8  Branch_static.zip

scripts/prep_release.sh

@@ -42,7 +42,7 @@ fi
 
 # Pre-release CocoaPod lint
 echo ">>> Linting release candidate..." 1>&2
-pod lib lint Branch.podspec --verbose 
+pod lib lint Branch.podspec --verbose --allow-warnings
 
 # Build the frameworks
 echo ">>> Building the frameworks..." 1>&2

scripts/version.sh

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