Merge branch 'master' into CORE-2469-remove-unused-files-from-repo

Author: echo-branch

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.40.1";
+NSString * const BNC_SDK_VERSION     = @"1.40.2";

Branch-SDK/BNCPreferenceHelper.m

@@ -787,13 +787,13 @@ - (NSMutableDictionary *)persistenceDict {
                 NSError *error = nil;
                 NSData *data = [NSData dataWithContentsOfURL:self.class.URLForPrefsFile options:0 error:&error];
                 if (!error && data) {
-                    if (@available(iOS 11.0, tvOS 11.0, *)) {
-                        persistenceDict = [NSKeyedUnarchiver unarchivedObjectOfClass:[BNCServerRequest class] fromData:data error:NULL];
-                    } else {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 12000
+//                    if (@available(iOS 11.0, tvOS 11.0, *)) {
+//                        persistenceDict = [NSKeyedUnarchiver unarchivedObjectOfClass:[NSMutableDictionary class] fromData:data error:NULL];
+//                    } else {
+//#if __IPHONE_OS_VERSION_MIN_REQUIRED < 12000
                         persistenceDict = [NSKeyedUnarchiver unarchiveObjectWithData:data];
-#endif
-                    }
+//#endif
+//                    }
                 }
             }
             @catch (NSException*) {

Branch-SDK/BNCServerInterface.m

@@ -275,7 +275,7 @@ - (BOOL)isLinkingRelatedRequest:(NSString *)endpoint {
     BOOL hasIdentifier = (prefs.linkClickIdentifier.length > 0 ) || (prefs.spotlightIdentifier.length > 0 ) || (prefs.universalLinkUrl.length > 0);
 
     // Allow install to resolve a link.
-    if ([endpoint containsString:@"/v1/install"] && hasIdentifier) {
+    if ([endpoint containsString:@"/v1/install"]) {
         return YES;
     }
 

Branch-TestBed/Framework-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.40.1</string>
+	<string>1.40.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.40.1</string>
+	<string>1.40.2</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.40.1"
+  s.version          = "1.40.2"
   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
 
+v.1.40.2
+- CORE-2502 Fix serialization issue
+
 v.1.40.1
 - CORE-2463 workaround server side issue with inconsisent response payload.
 

carthage-files/BranchSDK.xcodeproj/project.pbxproj

@@ -1662,7 +1662,7 @@
 				INFOPLIST_FILE = "Branch-tvOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 1.40.1;
+				MARKETING_VERSION = 1.40.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1698,7 +1698,7 @@
 				INFOPLIST_FILE = "Branch-tvOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 1.40.1;
+				MARKETING_VERSION = 1.40.2;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1730,7 +1730,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.40.1;
+				MARKETING_VERSION = 1.40.2;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1759,7 +1759,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.40.1;
+				MARKETING_VERSION = 1.40.2;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1914,7 +1914,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.40.1;
+				MARKETING_VERSION = 1.40.2;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1941,7 +1941,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.40.1;
+				MARKETING_VERSION = 1.40.2;
 				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
-933cb1aaf5094d1a578d8f4c8b014c1c4742c02b  Branch.zip
+4653a56d03e4502cd3e8c287ae34ceca20ffef3c  Branch.zip

carthage-files/checksum_noidfa

@@ -0,0 +1,2 @@
+#checksum for Branch on Github
+472054c29f4d4284ef01954a59cee54a90c9f0a2  Branch_noidfa.zip

carthage-files/checksum_static

@@ -1,2 +1,2 @@
 #checksum for Branch-static.zip on Github
-8f83c0b51b7c6a64265f86543cd8ffa2fffba7bd  Branch_static.zip
+c6371b163f28a37acf214507f70d0d2e162a597a  Branch_static.zip