Merge pull request #30 from BranchMetrics/SDK-2372-sync-SPM-repo-with-main-repo

sync repos

Author: echo-branch

BranchSDK.podspec

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

BranchSDK.xcodeproj/project.pbxproj

@@ -1974,7 +1974,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.4.1;
+				MARKETING_VERSION = 3.4.2;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2009,7 +2009,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.4.1;
+				MARKETING_VERSION = 3.4.2;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2215,7 +2215,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 3.4.1;
+				MARKETING_VERSION = 3.4.2;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2254,7 +2254,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 3.4.1;
+				MARKETING_VERSION = 3.4.2;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2291,7 +2291,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.4.1;
+				MARKETING_VERSION = 3.4.2;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2326,7 +2326,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.4.1;
+				MARKETING_VERSION = 3.4.2;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,

ChangeLog.md

@@ -1,5 +1,8 @@
 Branch iOS SDK Change Log
 
+v.3.4.2
+- Fix tvOS when using SPM
+
 v.3.4.1
 - Fix cold link launch when using deferred initialization and an AppDelegate only app.
 - Fix cocoapods privacy manifest collision.

Sources/BranchSDK/BNCConfig.m

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

Sources/BranchSDK/BNCContentDiscoveryManager.m

@@ -6,6 +6,8 @@
 //  Copyright © 2015 Branch Metrics. All rights reserved.
 //
 
+#if !TARGET_OS_TV
+
 #import "BNCContentDiscoveryManager.h"
 #import "Branch.h"
 #import "BranchConstants.h"
@@ -396,3 +398,4 @@ - (void)indexContentWithTitle:(NSString *)title
 }
 
 @end
+#endif

Sources/BranchSDK/BNCSpotlightService.m

@@ -6,6 +6,8 @@
 //  Copyright © 2017 Branch Metrics. All rights reserved.
 //
 
+#if !TARGET_OS_TV
+
 #import "BNCSpotlightService.h"
 #import "Branch.h"
 #import "BNCSystemObserver.h"
@@ -487,3 +489,4 @@ - (void)removeAllBranchSearchableItemsWithCallback:(void (^_Nullable)(NSError *
     #undef IndexingNotAvalable
 }
 @end
+#endif

Sources/BranchSDK/BNCUserAgentCollector.m

@@ -6,6 +6,7 @@
 //  Copyright © 2019 Branch, Inc. All rights reserved.
 //
 
+#if !TARGET_OS_TV
 #import "BNCUserAgentCollector.h"
 #import "BNCPreferenceHelper.h"
 #import "BNCDeviceSystem.h"
@@ -108,3 +109,4 @@ - (void)collectUserAgentWithCompletion:(void (^)(NSString *userAgent))completion
 }
 
 @end
+#endif

Sources/BranchSDK/BranchActivityItemProvider.m

@@ -6,6 +6,8 @@
 //  Copyright (c) 2015 Branch Metrics. All rights reserved.
 //
 
+#if !TARGET_OS_TV
+
 #import "BranchActivityItemProvider.h"
 #import "Branch.h"
 #import "BranchConstants.h"
@@ -255,3 +257,4 @@ - (NSString *)aliasForChannel:(NSString *)channel {
 }
 
 @end
+#endif

Sources/BranchSDK/BranchCSSearchableItemAttributeSet.m

@@ -5,6 +5,7 @@
 //  Created by Derrick Staten on 9/8/15.
 //  Copyright © 2015 Branch Metrics. All rights reserved.
 //
+#if !TARGET_OS_TV
 
 #import "BranchCSSearchableItemAttributeSet.h"
 #import "NSError+Branch.h"
@@ -157,3 +158,4 @@ - (void)indexContentWithUrl:(NSString *)url spotlightIdentifier:(NSString *)spot
 }
 
 @end
+#endif

Sources/BranchSDK/BranchPasteControl.m

@@ -6,6 +6,7 @@
 //  Copyright © 2022 Branch, Inc. All rights reserved.
 //
 
+#if !TARGET_OS_TV
 #import "BranchPasteControl.h"
 #import "Branch.h"
 
@@ -50,3 +51,4 @@ - (BOOL)canPasteItemProviders:(NSArray<NSItemProvider *> *)itemProviders {
 }
 
 @end
+#endif