Merge branch 'master' into SDK-2093-remove-OCMock

Author: echo-branch

BranchSDK.podspec

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

BranchSDK.xcodeproj/project.pbxproj

@@ -1953,7 +1953,11 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					LinkPresentation,
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1984,7 +1988,11 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					LinkPresentation,
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2186,7 +2194,11 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					LinkPresentation,
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
 				PRODUCT_MODULE_NAME = BranchSDK;
 				PRODUCT_NAME = BranchSDK;
@@ -2221,7 +2233,11 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					LinkPresentation,
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
 				PRODUCT_MODULE_NAME = BranchSDK;
 				PRODUCT_NAME = BranchSDK;
@@ -2254,7 +2270,11 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					LinkPresentation,
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
 				PRODUCT_NAME = BranchSDK;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2285,7 +2305,11 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					LinkPresentation,
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
 				PRODUCT_NAME = BranchSDK;
 				PROVISIONING_PROFILE_SPECIFIER = "";

BranchSDK/BNCConfig.m

@@ -8,7 +8,7 @@
 
 #include "BNCConfig.h"
 
-NSString * const BNC_SDK_VERSION  = @"3.0.0";
+NSString * const BNC_SDK_VERSION  = @"3.0.1";
 NSString * const BNC_LINK_URL = @"https://bnc.lt";
 NSString * const BNC_CDN_URL = @"https://cdn.branch.io";
 

BranchSDK/Branch.m

@@ -1733,6 +1733,7 @@ - (void)applicationDidBecomeActive {
 
 - (void)applicationWillResignActive {
     if (!Branch.trackingDisabled) {
+        self.initializationStatus = BNCInitStatusUninitialized;
         [self.requestQueue persistImmediately];
         [BranchOpenRequest setWaitNeededForOpenResponseLock];
         BNCLogDebugSDK(@"Application resigned active.");

ChangeLog.md

@@ -1,6 +1,9 @@
 Branch iOS SDK Change Log
 
-V.3.0.0
+v.3.0.1
+- Fix organic open when app is already running in background.
+
+v.3.0.0
 
 - Add a Privacy Manifest for the Branch SDK. App developers may need add an App level Privacy Manifest for data they collect and pass into the Branch SDK.
     - Known Issue: When using cocoapods without the `use_frameworks!` option, the build can fail with a duplicate privacy manifest error. Workaround is to manually merge privacy manifests.
@@ -21,21 +24,26 @@ V.3.0.0
     - pre-iOS 10 locale support
     - Device carrier. This was used for fraud analysis, but is no longer available on new iOS versions.
 
-V.2.2.1
+v.2.3.1
+This version is for a hotfix on Xamarin, it will not ship as a general iOS release.
+
+- SDK-2179 Fix LinkPresentation linker issue causing crash on Xamarin when run on iOS 12 or iOS 13. Thanks @LeadAssimilator.
+
+v.2.2.1
 
 Branch iOS SDK 2.2.1 adds parameter for current SKAN 4.0 Window in /v1/open and /v2/event requests.
 
 - SDK-1982 - SKAN Simplification DB updates
 
-V.2.2.0
+v.2.2.0
 
 Branch iOS SDK 2.2.0 adds the ability to include developer ID in installs and a new method to change the Branch API base URL.
 
 - SDK-1944 - Add Developer ID to v1/install
 - SDK-1755 - Remove old Apple Search Ads APIs
 - SDK-1934 - Expose a public method to change the Branch API base url
 
-V.2.1.2
+v.2.1.2
 
 Branch iOS SDK 2.1.2 adds additional support for Meta AEM links. It also includes some bug fixes and debugging improvements.
 

scripts/version.sh

@@ -30,7 +30,7 @@ Options:
 USAGE
 }
 
-version=2.2.1
+version=3.0.1
 prev_version="$version"
 
 if (( $# == 0 )); then
@@ -107,7 +107,7 @@ if [[ $update ]]; then
     sed -i '' -e "/^[[:space:]]*s\.version/ {s/\".*\"/\"$version\"/; }" ../BranchSDK.podspec
 
     # Update framework version
-    sed -ie 's/MARKETING_VERSION = '"$prev_version"'/MARKETING_VERSION = '"$version"'/g' ../BranchSDK.xcodeproj/project.pbxproj
+    sed -i '' -e 's/MARKETING_VERSION = '"$prev_version"'/MARKETING_VERSION = '"$version"'/g' ../BranchSDK.xcodeproj/project.pbxproj
 fi