Skip to content

Commit

Permalink
Merge pull request #1381 from BranchMetrics/SDK-1217-tvOS-spm-issue-2
Browse files Browse the repository at this point in the history
SDK-1217 workaround tvOS SPM issue
  • Loading branch information
echo-branch authored Apr 5, 2024
2 parents 89dea0c + 8ff3e14 commit 88d7937
Show file tree
Hide file tree
Showing 14 changed files with 35 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Sources/BranchSDK/BNCContentDiscoveryManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// Copyright © 2015 Branch Metrics. All rights reserved.
//

#if !TARGET_OS_TV

#import "BNCContentDiscoveryManager.h"
#import "Branch.h"
#import "BranchConstants.h"
Expand Down Expand Up @@ -396,3 +398,4 @@ - (void)indexContentWithTitle:(NSString *)title
}

@end
#endif
3 changes: 3 additions & 0 deletions Sources/BranchSDK/BNCSpotlightService.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// Copyright © 2017 Branch Metrics. All rights reserved.
//

#if !TARGET_OS_TV

#import "BNCSpotlightService.h"
#import "Branch.h"
#import "BNCSystemObserver.h"
Expand Down Expand Up @@ -487,3 +489,4 @@ - (void)removeAllBranchSearchableItemsWithCallback:(void (^_Nullable)(NSError *
#undef IndexingNotAvalable
}
@end
#endif
2 changes: 2 additions & 0 deletions Sources/BranchSDK/BNCUserAgentCollector.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// Copyright © 2019 Branch, Inc. All rights reserved.
//

#if !TARGET_OS_TV
#import "BNCUserAgentCollector.h"
#import "BNCPreferenceHelper.h"
#import "BNCDeviceSystem.h"
Expand Down Expand Up @@ -108,3 +109,4 @@ - (void)collectUserAgentWithCompletion:(void (^)(NSString *userAgent))completion
}

@end
#endif
3 changes: 3 additions & 0 deletions Sources/BranchSDK/BranchActivityItemProvider.m
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -255,3 +257,4 @@ - (NSString *)aliasForChannel:(NSString *)channel {
}

@end
#endif
2 changes: 2 additions & 0 deletions Sources/BranchSDK/BranchCSSearchableItemAttributeSet.m
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -157,3 +158,4 @@ - (void)indexContentWithUrl:(NSString *)url spotlightIdentifier:(NSString *)spot
}

@end
#endif
2 changes: 2 additions & 0 deletions Sources/BranchSDK/BranchPasteControl.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// Copyright © 2022 Branch, Inc. All rights reserved.
//

#if !TARGET_OS_TV
#import "BranchPasteControl.h"
#import "Branch.h"

Expand Down Expand Up @@ -50,3 +51,4 @@ - (BOOL)canPasteItemProviders:(NSArray<NSItemProvider *> *)itemProviders {
}

@end
#endif
2 changes: 2 additions & 0 deletions Sources/BranchSDK/BranchShareLink.m
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -330,3 +331,4 @@ - (void)addLPLinkMetadata:(NSString *)title icon:(UIImage *)icon API_AVAILABLE(i
}

@end
#endif
3 changes: 3 additions & 0 deletions Sources/BranchSDK/Private/BNCContentDiscoveryManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// Copyright © 2015 Branch Metrics. All rights reserved.
//

#if !TARGET_OS_TV

#if __has_feature(modules)
@import Foundation;
#else
Expand Down Expand Up @@ -60,3 +62,4 @@
spotlightCallback:(callbackWithUrlAndSpotlightIdentifier)spotlightCallback;

@end
#endif
3 changes: 3 additions & 0 deletions Sources/BranchSDK/Private/BNCSpotlightService.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// Copyright © 2017 Branch Metrics. All rights reserved.
//

#if !TARGET_OS_TV

#if __has_feature(modules)
@import Foundation;
#else
Expand Down Expand Up @@ -36,3 +38,4 @@

- (void)removeAllBranchSearchableItemsWithCallback:(void (^_Nullable)(NSError * _Nullable error))completion;
@end
#endif
2 changes: 2 additions & 0 deletions Sources/BranchSDK/Private/BNCUserAgentCollector.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
// Copyright © 2019 Branch, Inc. All rights reserved.
//

#if !TARGET_OS_TV
#if __has_feature(modules)
@import Foundation;
#else
Expand All @@ -28,3 +29,4 @@ NS_ASSUME_NONNULL_BEGIN
@end

NS_ASSUME_NONNULL_END
#endif
3 changes: 3 additions & 0 deletions Sources/BranchSDK/Public/BranchActivityItemProvider.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// Copyright (c) 2015 Branch Metrics. All rights reserved.
//

#if !TARGET_OS_TV

#if __has_feature(modules)
@import Foundation;
@import UIKit;
Expand Down Expand Up @@ -40,3 +42,4 @@

+ (NSString *)humanReadableChannelWithActivityType:(NSString *)activityString;
@end
#endif
2 changes: 2 additions & 0 deletions Sources/BranchSDK/Public/BranchCSSearchableItemAttributeSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -39,3 +40,4 @@ NS_ASSUME_NONNULL_BEGIN
@end

NS_ASSUME_NONNULL_END
#endif
2 changes: 2 additions & 0 deletions Sources/BranchSDK/Public/BranchPasteControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// Copyright © 2022 Branch, Inc. All rights reserved.
//

#if !TARGET_OS_TV
#import <UIKit/UIKit.h>

NS_ASSUME_NONNULL_BEGIN
Expand All @@ -20,3 +21,4 @@ API_AVAILABLE(ios(16.0), macCatalyst(16.0))

@end
NS_ASSUME_NONNULL_END
#endif
3 changes: 3 additions & 0 deletions Sources/BranchSDK/Public/BranchShareLink.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// Copyright © 2017 Branch Metrics. All rights reserved.
//

#if !TARGET_OS_TV

#import "BranchUniversalObject.h"
#import <LinkPresentation/LinkPresentation.h>
@class BranchShareLink;
Expand Down Expand Up @@ -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

0 comments on commit 88d7937

Please sign in to comment.