From 8ff3e144adc6f954291c0e9f5cd8ba509b594e39 Mon Sep 17 00:00:00 2001 From: echo Date: Fri, 5 Apr 2024 10:32:32 -0700 Subject: [PATCH] Use preprocessor to workaround tvOS SPM issue --- Sources/BranchSDK/BNCContentDiscoveryManager.m | 3 +++ Sources/BranchSDK/BNCSpotlightService.m | 3 +++ Sources/BranchSDK/BNCUserAgentCollector.m | 2 ++ Sources/BranchSDK/BranchActivityItemProvider.m | 3 +++ Sources/BranchSDK/BranchCSSearchableItemAttributeSet.m | 2 ++ Sources/BranchSDK/BranchPasteControl.m | 2 ++ Sources/BranchSDK/BranchShareLink.m | 2 ++ Sources/BranchSDK/Private/BNCContentDiscoveryManager.h | 3 +++ Sources/BranchSDK/Private/BNCSpotlightService.h | 3 +++ Sources/BranchSDK/Private/BNCUserAgentCollector.h | 2 ++ Sources/BranchSDK/Public/BranchActivityItemProvider.h | 3 +++ Sources/BranchSDK/Public/BranchCSSearchableItemAttributeSet.h | 2 ++ Sources/BranchSDK/Public/BranchPasteControl.h | 2 ++ Sources/BranchSDK/Public/BranchShareLink.h | 3 +++ 14 files changed, 35 insertions(+) diff --git a/Sources/BranchSDK/BNCContentDiscoveryManager.m b/Sources/BranchSDK/BNCContentDiscoveryManager.m index ec4feefb3..420107980 100644 --- a/Sources/BranchSDK/BNCContentDiscoveryManager.m +++ b/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 diff --git a/Sources/BranchSDK/BNCSpotlightService.m b/Sources/BranchSDK/BNCSpotlightService.m index 75aa0eaab..aa517c355 100644 --- a/Sources/BranchSDK/BNCSpotlightService.m +++ b/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 diff --git a/Sources/BranchSDK/BNCUserAgentCollector.m b/Sources/BranchSDK/BNCUserAgentCollector.m index 029173f4c..42dd3dc27 100644 --- a/Sources/BranchSDK/BNCUserAgentCollector.m +++ b/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 diff --git a/Sources/BranchSDK/BranchActivityItemProvider.m b/Sources/BranchSDK/BranchActivityItemProvider.m index ba75e76de..e55c37bd3 100644 --- a/Sources/BranchSDK/BranchActivityItemProvider.m +++ b/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 diff --git a/Sources/BranchSDK/BranchCSSearchableItemAttributeSet.m b/Sources/BranchSDK/BranchCSSearchableItemAttributeSet.m index b5b94844b..8f2fdaea4 100644 --- a/Sources/BranchSDK/BranchCSSearchableItemAttributeSet.m +++ b/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 diff --git a/Sources/BranchSDK/BranchPasteControl.m b/Sources/BranchSDK/BranchPasteControl.m index 5877b4ee5..f70b26f3e 100644 --- a/Sources/BranchSDK/BranchPasteControl.m +++ b/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 *)itemProviders { } @end +#endif diff --git a/Sources/BranchSDK/BranchShareLink.m b/Sources/BranchSDK/BranchShareLink.m index c6edc50f5..690b8c57f 100644 --- a/Sources/BranchSDK/BranchShareLink.m +++ b/Sources/BranchSDK/BranchShareLink.m @@ -5,6 +5,7 @@ // Created by Edward Smith on 3/13/17. // Copyright © 2017 Branch Metrics. All rights reserved. // +#if !TARGET_OS_TV #import "BranchShareLink.h" #import "BranchConstants.h" @@ -330,3 +331,4 @@ - (void)addLPLinkMetadata:(NSString *)title icon:(UIImage *)icon API_AVAILABLE(i } @end +#endif diff --git a/Sources/BranchSDK/Private/BNCContentDiscoveryManager.h b/Sources/BranchSDK/Private/BNCContentDiscoveryManager.h index ac696ca4d..02752fbd4 100644 --- a/Sources/BranchSDK/Private/BNCContentDiscoveryManager.h +++ b/Sources/BranchSDK/Private/BNCContentDiscoveryManager.h @@ -6,6 +6,8 @@ // Copyright © 2015 Branch Metrics. All rights reserved. // +#if !TARGET_OS_TV + #if __has_feature(modules) @import Foundation; #else @@ -60,3 +62,4 @@ spotlightCallback:(callbackWithUrlAndSpotlightIdentifier)spotlightCallback; @end +#endif diff --git a/Sources/BranchSDK/Private/BNCSpotlightService.h b/Sources/BranchSDK/Private/BNCSpotlightService.h index be3cac351..17180eef6 100644 --- a/Sources/BranchSDK/Private/BNCSpotlightService.h +++ b/Sources/BranchSDK/Private/BNCSpotlightService.h @@ -6,6 +6,8 @@ // Copyright © 2017 Branch Metrics. All rights reserved. // +#if !TARGET_OS_TV + #if __has_feature(modules) @import Foundation; #else @@ -36,3 +38,4 @@ - (void)removeAllBranchSearchableItemsWithCallback:(void (^_Nullable)(NSError * _Nullable error))completion; @end +#endif diff --git a/Sources/BranchSDK/Private/BNCUserAgentCollector.h b/Sources/BranchSDK/Private/BNCUserAgentCollector.h index a4eac8eb2..434d70d5c 100644 --- a/Sources/BranchSDK/Private/BNCUserAgentCollector.h +++ b/Sources/BranchSDK/Private/BNCUserAgentCollector.h @@ -8,6 +8,7 @@ // Copyright © 2019 Branch, Inc. All rights reserved. // +#if !TARGET_OS_TV #if __has_feature(modules) @import Foundation; #else @@ -28,3 +29,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END +#endif diff --git a/Sources/BranchSDK/Public/BranchActivityItemProvider.h b/Sources/BranchSDK/Public/BranchActivityItemProvider.h index 9a9068e15..f025779da 100644 --- a/Sources/BranchSDK/Public/BranchActivityItemProvider.h +++ b/Sources/BranchSDK/Public/BranchActivityItemProvider.h @@ -6,6 +6,8 @@ // Copyright (c) 2015 Branch Metrics. All rights reserved. // +#if !TARGET_OS_TV + #if __has_feature(modules) @import Foundation; @import UIKit; @@ -40,3 +42,4 @@ + (NSString *)humanReadableChannelWithActivityType:(NSString *)activityString; @end +#endif diff --git a/Sources/BranchSDK/Public/BranchCSSearchableItemAttributeSet.h b/Sources/BranchSDK/Public/BranchCSSearchableItemAttributeSet.h index 6e898f1be..65d127a18 100644 --- a/Sources/BranchSDK/Public/BranchCSSearchableItemAttributeSet.h +++ b/Sources/BranchSDK/Public/BranchCSSearchableItemAttributeSet.h @@ -5,6 +5,7 @@ // Created by Derrick Staten on 9/8/15. // Copyright © 2015 Branch Metrics. All rights reserved. // +#if !TARGET_OS_TV #if __has_feature(modules) @import Foundation; @@ -39,3 +40,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END +#endif diff --git a/Sources/BranchSDK/Public/BranchPasteControl.h b/Sources/BranchSDK/Public/BranchPasteControl.h index e02654765..2a5737f8e 100644 --- a/Sources/BranchSDK/Public/BranchPasteControl.h +++ b/Sources/BranchSDK/Public/BranchPasteControl.h @@ -6,6 +6,7 @@ // Copyright © 2022 Branch, Inc. All rights reserved. // +#if !TARGET_OS_TV #import NS_ASSUME_NONNULL_BEGIN @@ -20,3 +21,4 @@ API_AVAILABLE(ios(16.0), macCatalyst(16.0)) @end NS_ASSUME_NONNULL_END +#endif diff --git a/Sources/BranchSDK/Public/BranchShareLink.h b/Sources/BranchSDK/Public/BranchShareLink.h index d373938d3..e121c7678 100644 --- a/Sources/BranchSDK/Public/BranchShareLink.h +++ b/Sources/BranchSDK/Public/BranchShareLink.h @@ -6,6 +6,8 @@ // Copyright © 2017 Branch Metrics. All rights reserved. // +#if !TARGET_OS_TV + #import "BranchUniversalObject.h" #import @class BranchShareLink; @@ -137,3 +139,4 @@ Creates and attaches an LPLinkMetadata using the provided title and icon. This m - (void) addLPLinkMetadata:(NSString *_Nullable)title icon:(UIImage *_Nullable)icon API_AVAILABLE(ios(13.0), macCatalyst(13.1)); @end +#endif