Fix tvOS SPM tests (#8403)

paulb777 · web-flow · commit d287788cf7e2 · 2021-07-20T09:11:24.000-07:00
diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml
@@ -6,6 +6,7 @@ on:
     - '.github/workflows/spm.yml'
     - 'Package.swift'
     - '.swiftpm/*'
+    - 'scripts/build.sh'
     - 'Gemfile*'
   schedule:
     # Run every day at 12am (PST) - cron uses UTC times
diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewController.h b/FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewController.h
@@ -25,7 +25,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRIAMBannerViewController : FIRIAMBaseRenderingViewController
 + (FIRIAMBannerViewController *)
     instantiateViewControllerWithResourceBundle:(NSBundle *)resourceBundle
diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/Card/FIRIAMCardViewController.h b/FirebaseInAppMessaging/Sources/DefaultUI/Card/FIRIAMCardViewController.h
@@ -20,7 +20,7 @@
 @protocol FIRInAppMessagingDisplayDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRIAMCardViewController : FIRIAMBaseRenderingViewController
 
 + (FIRIAMCardViewController *)
diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.h b/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.h
@@ -23,7 +23,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRIAMBaseRenderingViewController : UIViewController
 @property(nonatomic, readwrite) id<FIRIAMTimeFetcher> timeFetcher;
 
diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.h b/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.h
@@ -25,7 +25,7 @@ NS_SWIFT_NAME(InAppMessagingDefaultDisplayImpl)
  * would be instantiated upon SDK start-up automatically. It's exposed in public interface
  * to help UI Testing app access the UI layer directly.
  */
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRIAMDefaultDisplayImpl : NSObject <FIRInAppMessagingDisplay>
 
 /// Conforms to display delegate for rendering of in-app messages.
diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMRenderingWindowHelper.h b/FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMRenderingWindowHelper.h
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
  * The caller is supposed to set the rootViewController to be the appropriate view controller
  * for the in-app message and call setHidden:NO to make it really visible.
  */
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRIAMRenderingWindowHelper : NSObject
 
 /// Returns the singleton `UIWindow` object used for rendering IAM views that block
diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/ImageOnly/FIRIAMImageOnlyViewController.h b/FirebaseInAppMessaging/Sources/DefaultUI/ImageOnly/FIRIAMImageOnlyViewController.h
@@ -23,7 +23,7 @@
 @protocol FIRInAppMessagingDisplayDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRIAMImageOnlyViewController : FIRIAMBaseRenderingViewController
 + (FIRIAMImageOnlyViewController *)
     instantiateViewControllerWithResourceBundle:(NSBundle *)resourceBundle
diff --git a/FirebaseInAppMessaging/Sources/DefaultUI/Modal/FIRIAMModalViewController.h b/FirebaseInAppMessaging/Sources/DefaultUI/Modal/FIRIAMModalViewController.h
@@ -22,7 +22,7 @@
 @protocol FIRInAppMessagingDisplayDelegate;
 
 NS_ASSUME_NONNULL_BEGIN
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRIAMModalViewController : FIRIAMBaseRenderingViewController
 + (FIRIAMModalViewController *)
     instantiateViewControllerWithResourceBundle:(NSBundle *)resourceBundle
diff --git a/FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.h b/FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.h
@@ -19,6 +19,6 @@
 // An implementation of FIRIAMDisplayCheckTriggerFlow by triggering the display check when
 // a Firebase Analytics event is fired.
 
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRIAMDisplayCheckOnAnalyticEventsFlow : FIRIAMDisplayCheckTriggerFlow
 @end
diff --git a/FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayExecutor.h b/FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayExecutor.h
@@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
 // conditions are satisfied for the rendering
 //   1 No current in-app message is being displayed
 //   2 For non-contextual messages, the display interval in display setting is met.
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRIAMDisplayExecutor : NSObject
 
 - (instancetype)initWithInAppMessaging:(FIRInAppMessaging *)inAppMessaging
diff --git a/FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMFetchOnAppForegroundFlow.h b/FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMFetchOnAppForegroundFlow.h
@@ -16,7 +16,7 @@
 #import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMFetchFlow.h"
 
 // an implementation of FIRIAMDisplayExecutor by triggering the display when app is foregrounded
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRIAMFetchOnAppForegroundFlow : FIRIAMFetchFlow
 - (void)start;
 - (void)stop;
diff --git a/FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMMessageClientCache.h b/FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMMessageClientCache.h
@@ -49,7 +49,7 @@ NS_ASSUME_NONNULL_BEGIN
 //
 // This class exists so that we can do message match more efficiently (in-memory search vs search
 // in local persistent storage) by using appropriate in-memory data structure.
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRIAMMessageClientCache : NSObject
 
 // used to inform the analytics event display check flow about whether it should start/stop
diff --git a/FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMFetchFlow.h b/FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMFetchFlow.h
@@ -43,7 +43,7 @@ typedef void (^FIRIAMFetchMessageCompletionHandler)(
 
 // Parent class for supporting different fetching flows. Subclass is supposed to trigger
 // checkAndFetch at appropriate moments based on its fetch strategy
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRIAMFetchFlow : NSObject
 - (instancetype)initWithSetting:(FIRIAMFetchSetting *)setting
                    messageCache:(FIRIAMMessageClientCache *)cache
diff --git a/FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMRuntimeManager.h b/FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMRuntimeManager.h
@@ -25,7 +25,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 // A class for managing the objects/dependencies for supporting different fiam flows at runtime
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRIAMRuntimeManager : NSObject
 @property(nonatomic, nonnull) FIRIAMSDKSettings *currentSetting;
 @property(nonatomic, nonnull) FIRIAMActivityLogger *activityLogger;
diff --git a/FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FIRInAppMessaging.h b/FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FIRInAppMessaging.h
@@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN
  *   3. Global Firebase data collection setting.
  **/
 
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 NS_SWIFT_NAME(InAppMessaging)
 @interface FIRInAppMessaging : NSObject
 /** @fn inAppMessaging
diff --git a/FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FIRInAppMessagingRendering.h b/FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FIRInAppMessagingRendering.h
@@ -74,7 +74,7 @@ NS_SWIFT_NAME(InAppMessagingActionButton)
 
 /** Contain display data for an image for a fiam message.
  */
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 NS_SWIFT_NAME(InAppMessagingImageData)
 @interface FIRInAppMessagingImageData : NSObject
 
@@ -99,7 +99,7 @@ NS_SWIFT_NAME(InAppMessagingImageData)
 
 /** Defines the metadata for the campaign to which a FIAM message belongs.
  */
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 NS_SWIFT_NAME(InAppMessagingCampaignInfo)
 @interface FIRInAppMessagingCampaignInfo : NSObject
 
@@ -125,7 +125,7 @@ NS_SWIFT_NAME(InAppMessagingCampaignInfo)
 
 /** Defines the metadata for a FIAM action.
  */
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 NS_SWIFT_NAME(InAppMessagingAction)
 @interface FIRInAppMessagingAction : NSObject
 
@@ -152,7 +152,7 @@ NS_SWIFT_NAME(InAppMessagingAction)
  * Base class representing a FIAM message to be displayed. Don't create instance
  * of this class directly. Instantiate one of its subclasses instead.
  */
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 NS_SWIFT_NAME(InAppMessagingDisplayMessage)
 @interface FIRInAppMessagingDisplayMessage : NSObject
 
@@ -188,8 +188,8 @@ NS_SWIFT_NAME(InAppMessagingDisplayMessage)
 
 @end
 
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 NS_SWIFT_NAME(InAppMessagingCardDisplay)
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRInAppMessagingCardDisplay : FIRInAppMessagingDisplayMessage
 
 /**
@@ -264,7 +264,7 @@ NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS
 
 /** Class for defining a modal message for display.
  */
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 NS_SWIFT_NAME(InAppMessagingModalDisplay)
 @interface FIRInAppMessagingModalDisplay : FIRInAppMessagingDisplayMessage
 
@@ -322,7 +322,7 @@ NS_SWIFT_NAME(InAppMessagingModalDisplay)
 
 /** Class for defining a banner message for display.
  */
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 NS_SWIFT_NAME(InAppMessagingBannerDisplay)
 @interface FIRInAppMessagingBannerDisplay : FIRInAppMessagingDisplayMessage
 
@@ -374,7 +374,7 @@ NS_SWIFT_NAME(InAppMessagingBannerDisplay)
 
 /** Class for defining a image-only message for display.
  */
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 NS_SWIFT_NAME(InAppMessagingImageOnlyDisplay)
 @interface FIRInAppMessagingImageOnlyDisplay : FIRInAppMessagingDisplayMessage
 
@@ -424,7 +424,7 @@ typedef NS_ENUM(NSInteger, FIAMDisplayRenderErrorType) {
  * A protocol defining those callbacks to be triggered by the message display component
  * under appropriate conditions.
  */
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 NS_SWIFT_NAME(InAppMessagingDisplayDelegate)
 @protocol FIRInAppMessagingDisplayDelegate <NSObject>
 
@@ -482,7 +482,7 @@ NS_SWIFT_NAME(InAppMessagingDisplayDelegate)
 /**
  * The protocol that a FIAM display component must implement.
  */
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 NS_SWIFT_NAME(InAppMessagingDisplay)
 @protocol FIRInAppMessagingDisplay
 
diff --git a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMActionURLFollower.m b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMActionURLFollower.m
@@ -23,7 +23,7 @@
 #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
 #import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMActionURLFollower.h"
 
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @interface FIRIAMActionURLFollower ()
 @property(nonatomic, readonly, nonnull, copy) NSSet<NSString *> *appCustomURLSchemesSet;
 @property(nonatomic, readonly) BOOL isOldAppDelegateOpenURLDefined;
@@ -34,7 +34,7 @@ @interface FIRIAMActionURLFollower ()
 @property(nonatomic, readonly, nonnull) UIApplication *mainApplication;
 @end
 
-NS_EXTENSION_UNAVAILABLE_IOS("Firebase In App Messaging is not supported for iOS extensions.")
+NS_EXTENSION_UNAVAILABLE("Firebase In App Messaging is not supported for iOS extensions.")
 @implementation FIRIAMActionURLFollower
 
 + (FIRIAMActionURLFollower *)actionURLFollower {
diff --git a/FirebaseInAppMessaging/Swift/Source/CustomInAppMessageDisplayViewModifier.swift b/FirebaseInAppMessaging/Swift/Source/CustomInAppMessageDisplayViewModifier.swift
@@ -19,6 +19,7 @@ import SwiftUI
 
 @available(iOS 13, tvOS 13, *)
 @available(iOSApplicationExtension, unavailable)
+@available(tvOSApplicationExtension, unavailable)
 struct ImageOnlyInAppMessageDisplayViewModifier<DisplayMessage: View>: ViewModifier {
   var closure: (InAppMessagingImageOnlyDisplay, InAppMessagingDisplayDelegate) -> DisplayMessage
   @ObservedObject var delegateBridge = DelegateBridge.shared
@@ -41,6 +42,7 @@ struct ImageOnlyInAppMessageDisplayViewModifier<DisplayMessage: View>: ViewModif
 
 @available(iOS 13, tvOS 13, *)
 @available(iOSApplicationExtension, unavailable)
+@available(tvOSApplicationExtension, unavailable)
 public extension View {
   /// Overrides the default display of an image only in-app message as defined on the Firebase console.
   func imageOnlyInAppMessage<Content: View>(closure: @escaping (InAppMessagingImageOnlyDisplay,
@@ -55,6 +57,7 @@ public extension View {
 
 @available(iOS 13, tvOS 13, *)
 @available(iOSApplicationExtension, unavailable)
+@available(tvOSApplicationExtension, unavailable)
 struct BannerInAppMessageDisplayViewModifier<DisplayMessage: View>: ViewModifier {
   var closure: (InAppMessagingBannerDisplay, InAppMessagingDisplayDelegate) -> DisplayMessage
   @ObservedObject var delegateBridge = DelegateBridge.shared
@@ -76,6 +79,7 @@ struct BannerInAppMessageDisplayViewModifier<DisplayMessage: View>: ViewModifier
 
 @available(iOS 13, tvOS 13, *)
 @available(iOSApplicationExtension, unavailable)
+@available(tvOSApplicationExtension, unavailable)
 public extension View {
   /// Overrides the default display of a banner in-app message as defined on the Firebase console.
   func bannerInAppMessage<Content: View>(closure: @escaping (InAppMessagingBannerDisplay,
@@ -90,6 +94,7 @@ public extension View {
 
 @available(iOS 13, tvOS 13, *)
 @available(iOSApplicationExtension, unavailable)
+@available(tvOSApplicationExtension, unavailable)
 struct ModalInAppMessageDisplayViewModifier<DisplayMessage: View>: ViewModifier {
   var closure: (InAppMessagingModalDisplay, InAppMessagingDisplayDelegate) -> DisplayMessage
   @ObservedObject var delegateBridge = DelegateBridge.shared
@@ -111,6 +116,7 @@ struct ModalInAppMessageDisplayViewModifier<DisplayMessage: View>: ViewModifier
 
 @available(iOS 13, tvOS 13, *)
 @available(iOSApplicationExtension, unavailable)
+@available(tvOSApplicationExtension, unavailable)
 public extension View {
   /// Overrides the default display of a modal in-app message as defined on the Firebase console.
   func modalInAppMessage<Content: View>(closure: @escaping (InAppMessagingModalDisplay,
@@ -125,6 +131,7 @@ public extension View {
 
 @available(iOS 13, tvOS 13, *)
 @available(iOSApplicationExtension, unavailable)
+@available(tvOSApplicationExtension, unavailable)
 struct CardInAppMessageDisplayViewModifier<DisplayMessage: View>: ViewModifier {
   var closure: (InAppMessagingCardDisplay, InAppMessagingDisplayDelegate) -> DisplayMessage
   @ObservedObject var delegateBridge = DelegateBridge.shared
@@ -146,6 +153,7 @@ struct CardInAppMessageDisplayViewModifier<DisplayMessage: View>: ViewModifier {
 
 @available(iOS 13, tvOS 13, *)
 @available(iOSApplicationExtension, unavailable)
+@available(tvOSApplicationExtension, unavailable)
 public extension View {
   /// Overrides the default display of a card in-app message as defined on the Firebase console.
   func cardInAppMessage<Content: View>(closure: @escaping (InAppMessagingCardDisplay,
@@ -164,6 +172,7 @@ public extension View {
  */
 @available(iOS 13, tvOS 13, *)
 @available(iOSApplicationExtension, unavailable)
+@available(tvOSApplicationExtension, unavailable)
 class DelegateBridge: NSObject, InAppMessagingDisplay, InAppMessagingDisplayDelegate,
   ObservableObject {
   @Published var inAppMessageData: (InAppMessagingDisplayMessage,
diff --git a/FirebaseInAppMessaging/Swift/Source/SwiftUIPreviewHelpers.swift b/FirebaseInAppMessaging/Swift/Source/SwiftUIPreviewHelpers.swift
@@ -14,25 +14,25 @@
 
 import FirebaseInAppMessaging
 
-@available(iOS 13, tvOS 13, *)
+@available(iOS 13.0, tvOS 13.0, *)
 @available(iOSApplicationExtension, unavailable)
+@available(tvOSApplicationExtension, unavailable)
 public struct InAppMessagingPreviewHelpers {
+  public static let foo = UIColor.black
   public static func cardMessage(campaignName: String = "Card message campaign",
                                  title: String = "Title for modal message",
                                  body: String? = "Body for modal message",
                                  textColor: UIColor = UIColor.label,
-                                 backgroundColor: UIColor = UIColor.systemBackground,
+                                 backgroundColor: UIColor = UIColor.black,
                                  portraitImage: UIImage = UIImage(systemName: "rectangle")!,
                                  landscapeImage: UIImage? = UIImage(systemName: "square"),
                                  primaryButtonText: String = "Click me!",
                                  primaryButtonTextColor: UIColor = UIColor.systemBlue,
-                                 primaryButtonBackgroundColor: UIColor = UIColor
-                                   .secondarySystemBackground,
+                                 primaryButtonBackgroundColor: UIColor = UIColor.systemGray,
                                  primaryActionURL: URL? = nil,
                                  secondaryButtonText: String? = "Dismiss",
                                  secondaryButtonTextColor: UIColor? = UIColor.secondaryLabel,
-                                 secondaryButtonBackgroundColor: UIColor? = UIColor
-                                   .tertiarySystemBackground,
+                                 secondaryButtonBackgroundColor: UIColor? = UIColor.systemYellow,
                                  secondaryActionURL: URL? = nil,
                                  appData: [String: String]? = nil) -> InAppMessagingCardDisplay {
     // This may crash the preview if an invalid portrait image is provided, card messages must have
diff --git a/SwiftPMTests/swift-test/main.swift b/SwiftPMTests/swift-test/main.swift
@@ -47,6 +47,8 @@ import nanopb
 
 import XCTest
 
+@available(iOSApplicationExtension, unavailable)
+@available(tvOSApplicationExtension, unavailable)
 class importTest: XCTestCase {
   func testImports() throws {
     XCTAssertFalse(GULAppEnvironmentUtil.isAppStoreReceiptSandbox())
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -646,12 +646,13 @@ case "$product-$platform-$method" in
       test
     ;;
 
-  # Note that the combine tests require setting the minimum iOS version to 13.0
+  # Note that the combine tests require setting the minimum iOS and tvOS version to 13.0
   *-*-spm)
     RunXcodebuild \
       -scheme $product \
       "${xcb_flags[@]}" \
       IPHONEOS_DEPLOYMENT_TARGET=13.0 \
+      TVOS_DEPLOYMENT_TARGET=13.0 \
       test
     ;;
 
