From dfa00a63a588d6ad5934c4e5d482b71d0940e489 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Fri, 10 May 2024 11:58:11 -0400 Subject: [PATCH] [Infra] Clean up visionOS conditionals --- FirebaseCore/Sources/FIRApp.m | 2 +- FirebaseCore/Tests/Unit/FIRAppTest.m | 2 +- .../Sources/Core/FPersistentConnection.m | 3 +-- FirebaseDatabase/Sources/Core/FRepo.m | 6 ++---- .../Sources/Persistence/FLevelDBStorageEngine.m | 3 +-- .../Sources/Realtime/FWebSocketConnection.m | 6 ++---- .../Analytics/FIRIAMAnalyticsEventLoggerImpl.m | 4 ++-- .../Analytics/FIRIAMClearcutHttpRequestSender.m | 4 ++-- .../Analytics/FIRIAMClearcutLogStorage.m | 4 ++-- .../Sources/Analytics/FIRIAMClearcutLogger.m | 4 ++-- .../Sources/Analytics/FIRIAMClearcutUploader.m | 4 ++-- .../Sources/Data/FIRIAMFetchResponseParser.m | 4 ++-- .../Data/FIRIAMMessageContentDataWithImageURL.m | 4 ++-- .../Sources/Data/FIRIAMMessageDefinition.m | 4 ++-- .../Sources/Data/FIRIAMRenderingEffectSetting.m | 4 ++-- .../FIRIAMDisplayTriggerDefinition.m | 4 ++-- .../Sources/FIRCore+InAppMessaging.m | 4 ++-- .../Sources/FIRInAppMessaging.m | 4 ++-- .../Sources/Flows/FIRIAMActivityLogger.m | 4 ++-- .../Sources/Flows/FIRIAMBookKeeper.m | 4 ++-- .../Sources/Flows/FIRIAMClientInfoFetcher.m | 4 ++-- .../FIRIAMDisplayCheckOnAnalyticEventsFlow.m | 4 ++-- .../FIRIAMDisplayCheckOnAppForegroundFlow.m | 4 ++-- ...IAMDisplayCheckOnFetchDoneNotificationFlow.m | 4 ++-- .../Flows/FIRIAMDisplayCheckTriggerFlow.m | 4 ++-- .../Sources/Flows/FIRIAMDisplayExecutor.m | 4 ++-- .../Sources/Flows/FIRIAMFetchFlow.m | 4 ++-- .../Flows/FIRIAMFetchOnAppForegroundFlow.m | 4 ++-- .../Sources/Flows/FIRIAMMessageClientCache.m | 4 ++-- .../Flows/FIRIAMMsgFetcherUsingRestful.m | 4 ++-- .../Sources/Flows/FIRIAMServerMsgFetchStorage.m | 4 ++-- .../FIRInAppMessagingRenderingDataClasses.m | 4 ++-- .../Sources/Runtime/FIRIAMActionURLFollower.m | 4 ++-- .../Sources/Runtime/FIRIAMRuntimeManager.m | 4 ++-- .../Sources/Runtime/FIRIAMSDKModeManager.m | 4 ++-- .../Sources/Runtime/FIRIAMSDKSettings.m | 4 ++-- .../Runtime/FIRInAppMessaging+Bootstrap.m | 4 ++-- .../Sources/Util/FIRIAMElapsedTimeTracker.m | 4 ++-- .../Sources/Util/FIRIAMTimeFetcher.m | 4 ++-- .../Sources/Util/NSString+FIRInterlaceStrings.m | 4 ++-- .../UIApplication+FIRForegroundWindowScene.m | 4 ++-- .../Sources/Util/UIColor+FIRIAMHexString.m | 4 ++-- .../Sources/FIRMessagingUtilities.m | 3 +-- .../Sources/Token/FIRMessagingAuthKeychain.m | 2 +- .../src/remote/connectivity_monitor_apple.mm | 17 ++++++----------- Firestore/core/src/util/filesystem_apple.mm | 5 ++--- .../FirebaseFirestoreWrap/dummy.m | 2 +- .../FirebaseInAppMessagingWrap/dummy.m | 2 +- 48 files changed, 92 insertions(+), 105 deletions(-) diff --git a/FirebaseCore/Sources/FIRApp.m b/FirebaseCore/Sources/FIRApp.m index 8f4aefe4bc7..196cba65f8f 100644 --- a/FirebaseCore/Sources/FIRApp.m +++ b/FirebaseCore/Sources/FIRApp.m @@ -855,7 +855,7 @@ + (void)registerSwiftComponents { #pragma mark - App Life Cycle - (void)subscribeForAppDidBecomeActiveNotifications { -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION NSNotificationName notificationName = UIApplicationDidBecomeActiveNotification; #elif TARGET_OS_OSX NSNotificationName notificationName = NSApplicationDidBecomeActiveNotification; diff --git a/FirebaseCore/Tests/Unit/FIRAppTest.m b/FirebaseCore/Tests/Unit/FIRAppTest.m index 285c76500c3..b231e608b92 100644 --- a/FirebaseCore/Tests/Unit/FIRAppTest.m +++ b/FirebaseCore/Tests/Unit/FIRAppTest.m @@ -862,7 +862,7 @@ - (XCTestExpectation *)expectNotificationNamed:(NSNotificationName)name } - (NSNotificationName)appDidBecomeActiveNotificationName { -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION return UIApplicationDidBecomeActiveNotification; #elif TARGET_OS_OSX return NSApplicationDidBecomeActiveNotification; diff --git a/FirebaseDatabase/Sources/Core/FPersistentConnection.m b/FirebaseDatabase/Sources/Core/FPersistentConnection.m index 3d1e8af9053..da2820d5deb 100644 --- a/FirebaseDatabase/Sources/Core/FPersistentConnection.m +++ b/FirebaseDatabase/Sources/Core/FPersistentConnection.m @@ -1256,8 +1256,7 @@ - (void)sendStats:(NSDictionary *)stats { - (void)sendConnectStats { NSMutableDictionary *stats = [NSMutableDictionary dictionary]; -#if TARGET_OS_IOS || TARGET_OS_TV || \ - (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION if (self.config.persistenceEnabled) { stats[@"persistence.ios.enabled"] = @1; } diff --git a/FirebaseDatabase/Sources/Core/FRepo.m b/FirebaseDatabase/Sources/Core/FRepo.m index 00b0850cd17..628de6a719a 100644 --- a/FirebaseDatabase/Sources/Core/FRepo.m +++ b/FirebaseDatabase/Sources/Core/FRepo.m @@ -52,8 +52,7 @@ #import "FirebaseDatabase/Sources/Utilities/Tuples/FTupleTransaction.h" #import -#if TARGET_OS_IOS || TARGET_OS_TV || \ - (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import #endif @@ -816,8 +815,7 @@ - (void)didEnterBackground { // Targetted compilation is ONLY for testing. UIKit is weak-linked in actual // release build. -#if TARGET_OS_IOS || TARGET_OS_TV || \ - (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION // The idea is to wait until any outstanding sets get written to disk. Since // the sets might still be in our dispatch queue, we wait for the dispatch // queue to catch up and for persistence to catch up. This may be diff --git a/FirebaseDatabase/Sources/Persistence/FLevelDBStorageEngine.m b/FirebaseDatabase/Sources/Persistence/FLevelDBStorageEngine.m index 6516baa43c7..4dd808da3a1 100644 --- a/FirebaseDatabase/Sources/Persistence/FLevelDBStorageEngine.m +++ b/FirebaseDatabase/Sources/Persistence/FLevelDBStorageEngine.m @@ -275,8 +275,7 @@ - (void)close { } + (NSString *)firebaseDir { -#if TARGET_OS_IOS || TARGET_OS_WATCH || \ - (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_WATCH || TARGET_OS_VISION NSArray *dirPaths = NSSearchPathForDirectoriesInDomains( NSDocumentDirectory, NSUserDomainMask, YES); NSString *documentsDir = [dirPaths objectAtIndex:0]; diff --git a/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m b/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m index 5ac1bfa2f85..4c7849ec8d2 100644 --- a/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m +++ b/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m @@ -26,8 +26,7 @@ #import "FirebaseDatabase/Sources/Realtime/FWebSocketConnection.h" #import "FirebaseDatabase/Sources/Utilities/FStringUtilities.h" -#if TARGET_OS_IOS || TARGET_OS_TV || \ - (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import #endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && // TARGET_OS_VISION) @@ -146,8 +145,7 @@ - (NSString *)userAgent { // Targetted compilation is ONLY for testing. UIKit is weak-linked in actual // release build. -#if TARGET_OS_IOS || TARGET_OS_TV || \ - (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION Class uiDeviceClass = NSClassFromString(@"UIDevice"); if (uiDeviceClass) { systemVersion = [uiDeviceClass currentDevice].systemVersion; diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m index 8176cb83c68..f4f8a8bc577 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import @@ -176,4 +176,4 @@ - (void)logAnalyticsEventForType:(FIRIAMAnalyticsLogEventType)eventType } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.m index 881621eb258..955aab345d4 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseCore/Extension/FirebaseCoreInternal.h" @@ -204,4 +204,4 @@ - (void)sendClearcutHttpRequestForLogs:(NSArray *)log } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m index 1d94a2de83b..d377570e9a3 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import @@ -209,4 +209,4 @@ - (BOOL)saveIntoCacheWithPath:(NSString *)cacheFilePath { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogger.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogger.m index ea00175ebd0..be16272c896 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogger.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogger.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseCore/Extension/FirebaseCoreInternal.h" @@ -214,4 +214,4 @@ - (void)logAnalyticsEventForType:(FIRIAMAnalyticsLogEventType)eventType } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m index c520f21616a..9d9ad3332cc 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import #import @@ -246,4 +246,4 @@ - (void)scheduleNextSend { @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Data/FIRIAMFetchResponseParser.m b/FirebaseInAppMessaging/Sources/Data/FIRIAMFetchResponseParser.m index 8a85321de6e..7becace2949 100644 --- a/FirebaseInAppMessaging/Sources/Data/FIRIAMFetchResponseParser.m +++ b/FirebaseInAppMessaging/Sources/Data/FIRIAMFetchResponseParser.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseCore/Extension/FirebaseCoreInternal.h" @@ -399,4 +399,4 @@ - (NSString *)sanitizedURLStringFromString:(NSString *)string { @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageContentDataWithImageURL.m b/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageContentDataWithImageURL.m index 60b0b78bbcc..abe867bf6d6 100644 --- a/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageContentDataWithImageURL.m +++ b/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageContentDataWithImageURL.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseCore/Extension/FirebaseCoreInternal.h" @@ -206,4 +206,4 @@ - (void)fetchImageFromURL:(NSURL *)imageURL @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageDefinition.m b/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageDefinition.m index fb564630bca..4d72b82ac20 100644 --- a/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageDefinition.m +++ b/FirebaseInAppMessaging/Sources/Data/FIRIAMMessageDefinition.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageDefinition.h" @@ -109,4 +109,4 @@ - (BOOL)messageHasStarted { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Data/FIRIAMRenderingEffectSetting.m b/FirebaseInAppMessaging/Sources/Data/FIRIAMRenderingEffectSetting.m index eeefee2d24e..1530049c6ba 100644 --- a/FirebaseInAppMessaging/Sources/Data/FIRIAMRenderingEffectSetting.m +++ b/FirebaseInAppMessaging/Sources/Data/FIRIAMRenderingEffectSetting.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMRenderingEffectSetting.h" @@ -34,4 +34,4 @@ + (instancetype)getDefaultRenderingEffectSetting { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/DisplayTrigger/FIRIAMDisplayTriggerDefinition.m b/FirebaseInAppMessaging/Sources/DisplayTrigger/FIRIAMDisplayTriggerDefinition.m index 766ec4cc4cf..9de6b8a804b 100644 --- a/FirebaseInAppMessaging/Sources/DisplayTrigger/FIRIAMDisplayTriggerDefinition.m +++ b/FirebaseInAppMessaging/Sources/DisplayTrigger/FIRIAMDisplayTriggerDefinition.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseInAppMessaging/Sources/Private/DisplayTrigger/FIRIAMDisplayTriggerDefinition.h" @@ -43,4 +43,4 @@ - (instancetype)initWithFirebaseAnalyticEvent:(NSString *)title { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.m b/FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.m index 58c3a741cc3..db5ae0816e0 100644 --- a/FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.m +++ b/FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" @@ -23,4 +23,4 @@ NSString *const kFirebaseInAppMessagingErrorDomain = @"com.firebase.inappmessaging"; FIRLoggerService kFIRLoggerInAppMessaging = @"[FirebaseInAppMessaging]"; -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/FIRInAppMessaging.m b/FirebaseInAppMessaging/Sources/FIRInAppMessaging.m index 3f9595582ac..8b65d0a4efa 100644 --- a/FirebaseInAppMessaging/Sources/FIRInAppMessaging.m +++ b/FirebaseInAppMessaging/Sources/FIRInAppMessaging.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FIRInAppMessaging.h" @@ -145,4 +145,4 @@ - (void)triggerEvent:(NSString *)eventName { @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMActivityLogger.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMActivityLogger.m index 20862570659..3ae983e2c93 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMActivityLogger.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMActivityLogger.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import @@ -245,4 +245,4 @@ - (void)addLogRecord:(FIRIAMActivityRecord *)newRecord { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMBookKeeper.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMBookKeeper.m index db85d8723c5..5e17566b4cc 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMBookKeeper.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMBookKeeper.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import @@ -264,4 +264,4 @@ - (void)cleanupFetchRecords { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMClientInfoFetcher.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMClientInfoFetcher.m index 7d32c188a02..f9363e438ca 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMClientInfoFetcher.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMClientInfoFetcher.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" @@ -133,4 +133,4 @@ - (NSString *)getIAMSDKVersion { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.m index 63e7651dc96..4e3a1491919 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" @@ -68,4 +68,4 @@ - (void)stop { @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAppForegroundFlow.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAppForegroundFlow.m index 078b7d39706..76c760ccced 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAppForegroundFlow.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAppForegroundFlow.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseCore/Extension/FirebaseCoreInternal.h" @@ -67,4 +67,4 @@ - (void)dealloc { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnFetchDoneNotificationFlow.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnFetchDoneNotificationFlow.m index 45d4b39f563..6983910c051 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnFetchDoneNotificationFlow.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnFetchDoneNotificationFlow.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseCore/Extension/FirebaseCoreInternal.h" @@ -64,4 +64,4 @@ - (void)dealloc { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckTriggerFlow.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckTriggerFlow.m index b7f3137ad18..6ab0c90c41f 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckTriggerFlow.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckTriggerFlow.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckTriggerFlow.h" @@ -34,4 +34,4 @@ - (void)stop { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m index c4ec0def848..0cfb0567365 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import #import "FirebaseCore/Extension/FirebaseCoreInternal.h" @@ -778,4 +778,4 @@ - (void)checkAndDisplayNextAppForegroundMessage { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchFlow.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchFlow.m index 38f8c181ffe..890fece4d57 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchFlow.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchFlow.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseCore/Extension/FirebaseCoreInternal.h" @@ -267,4 +267,4 @@ - (void)checkForAppLaunchMessage { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchOnAppForegroundFlow.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchOnAppForegroundFlow.m index 0a217b1faa6..75e4f462dfb 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchOnAppForegroundFlow.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchOnAppForegroundFlow.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseCore/Extension/FirebaseCoreInternal.h" @@ -61,4 +61,4 @@ - (void)dealloc { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMMessageClientCache.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMMessageClientCache.m index 37f24531edd..844272ceaa0 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMMessageClientCache.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMMessageClientCache.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseCore/Extension/FirebaseCoreInternal.h" @@ -238,4 +238,4 @@ - (void)loadMessageDataFromServerFetchStorage:(FIRIAMServerMsgFetchStorage *)fet } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMMsgFetcherUsingRestful.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMMsgFetcherUsingRestful.m index 772148b6018..77053791922 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMMsgFetcherUsingRestful.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMMsgFetcherUsingRestful.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseCore/Extension/FirebaseCoreInternal.h" @@ -277,4 +277,4 @@ - (void)fetchMessagesWithImpressionList:(NSArray *)imp } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMServerMsgFetchStorage.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMServerMsgFetchStorage.m index 713550f8685..dfe42933697 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMServerMsgFetchStorage.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMServerMsgFetchStorage.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseCore/Extension/FirebaseCoreInternal.h" @@ -66,4 +66,4 @@ - (void)readResponseDictionary:(void (^)(NSDictionary *response, BOOL success))c } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/RenderingObjects/FIRInAppMessagingRenderingDataClasses.m b/FirebaseInAppMessaging/Sources/RenderingObjects/FIRInAppMessagingRenderingDataClasses.m index 36d81939500..663c72b8438 100644 --- a/FirebaseInAppMessaging/Sources/RenderingObjects/FIRInAppMessagingRenderingDataClasses.m +++ b/FirebaseInAppMessaging/Sources/RenderingObjects/FIRInAppMessagingRenderingDataClasses.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import @@ -371,4 +371,4 @@ - (instancetype)initWithActionText:(nullable NSString *)actionText @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMActionURLFollower.m b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMActionURLFollower.m index cbcae06e2cb..f16936f9423 100644 --- a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMActionURLFollower.m +++ b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMActionURLFollower.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import #import @@ -227,4 +227,4 @@ + (BOOL)isHttpOrHttpsScheme:(NSURL *)url { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMRuntimeManager.m b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMRuntimeManager.m index 499b6fddc9b..b3fb094c67b 100644 --- a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMRuntimeManager.m +++ b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMRuntimeManager.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import @@ -446,4 +446,4 @@ - (void)internalStartRuntimeWithSDKSettings:(FIRIAMSDKSettings *)settings { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKModeManager.m b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKModeManager.m index 6aa77c29f8d..39d51af13ca 100644 --- a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKModeManager.m +++ b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKModeManager.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import @@ -117,4 +117,4 @@ - (FIRIAMSDKMode)currentMode { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKSettings.m b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKSettings.m index eccb73beaea..d2d05f6267b 100644 --- a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKSettings.m +++ b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKSettings.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKSettings.h" @@ -37,4 +37,4 @@ - (NSString *)description { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m b/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m index 1d1c773bf54..800c70787f6 100644 --- a/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m +++ b/FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRInAppMessaging+Bootstrap.h" @@ -136,4 +136,4 @@ + (void)exitAppWithFatalError:(NSError *)error { @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Util/FIRIAMElapsedTimeTracker.m b/FirebaseInAppMessaging/Sources/Util/FIRIAMElapsedTimeTracker.m index b299f17b3c7..d60a8e48c58 100644 --- a/FirebaseInAppMessaging/Sources/Util/FIRIAMElapsedTimeTracker.m +++ b/FirebaseInAppMessaging/Sources/Util/FIRIAMElapsedTimeTracker.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseInAppMessaging/Sources/Util/FIRIAMElapsedTimeTracker.h" @interface FIRIAMElapsedTimeTracker () @@ -58,4 +58,4 @@ - (instancetype)initWithTimeFetcher:(id)timeFetcher { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Util/FIRIAMTimeFetcher.m b/FirebaseInAppMessaging/Sources/Util/FIRIAMTimeFetcher.m index c94798d87dd..1c74a24e264 100644 --- a/FirebaseInAppMessaging/Sources/Util/FIRIAMTimeFetcher.m +++ b/FirebaseInAppMessaging/Sources/Util/FIRIAMTimeFetcher.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h" @@ -25,4 +25,4 @@ - (NSTimeInterval)currentTimestampInSeconds { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Util/NSString+FIRInterlaceStrings.m b/FirebaseInAppMessaging/Sources/Util/NSString+FIRInterlaceStrings.m index ed2671daa9a..787da932356 100644 --- a/FirebaseInAppMessaging/Sources/Util/NSString+FIRInterlaceStrings.m +++ b/FirebaseInAppMessaging/Sources/Util/NSString+FIRInterlaceStrings.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseInAppMessaging/Sources/Private/Util/NSString+FIRInterlaceStrings.h" @@ -44,4 +44,4 @@ + (NSString *)fir_interlaceString:(NSString *)stringOne withString:(NSString *)s @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Util/UIApplication+FIRForegroundWindowScene.m b/FirebaseInAppMessaging/Sources/Util/UIApplication+FIRForegroundWindowScene.m index ad0a5ec22c4..1658ad41c74 100644 --- a/FirebaseInAppMessaging/Sources/Util/UIApplication+FIRForegroundWindowScene.m +++ b/FirebaseInAppMessaging/Sources/Util/UIApplication+FIRForegroundWindowScene.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseInAppMessaging/Sources/Private/Util/UIApplication+FIRForegroundWindowScene.h" @@ -37,4 +37,4 @@ - (nullable UIWindowScene *)fir_foregroundWindowScene { @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseInAppMessaging/Sources/Util/UIColor+FIRIAMHexString.m b/FirebaseInAppMessaging/Sources/Util/UIColor+FIRIAMHexString.m index 3374623070a..34c9e220e0e 100644 --- a/FirebaseInAppMessaging/Sources/Util/UIColor+FIRIAMHexString.m +++ b/FirebaseInAppMessaging/Sources/Util/UIColor+FIRIAMHexString.m @@ -15,7 +15,7 @@ */ #import -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import "FirebaseInAppMessaging/Sources/Util/UIColor+FIRIAMHexString.h" @@ -41,4 +41,4 @@ + (UIColor *)firiam_colorWithHexString:(nullable NSString *)hexString { } @end -#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION diff --git a/FirebaseMessaging/Sources/FIRMessagingUtilities.m b/FirebaseMessaging/Sources/FIRMessagingUtilities.m index 713febdb833..2d9bddb5187 100644 --- a/FirebaseMessaging/Sources/FIRMessagingUtilities.m +++ b/FirebaseMessaging/Sources/FIRMessagingUtilities.m @@ -311,8 +311,7 @@ BOOL FIRMessagingIsProductionApp(void) { #if TARGET_OS_OSX || TARGET_OS_MACCATALYST NSString *path = [[[[NSBundle mainBundle] resourcePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"embedded.provisionprofile"]; -#elif TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_WATCH || \ - (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#elif TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_WATCH || TARGET_OS_VISION NSString *path = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"embedded.mobileprovision"]; #endif diff --git a/FirebaseMessaging/Sources/Token/FIRMessagingAuthKeychain.m b/FirebaseMessaging/Sources/Token/FIRMessagingAuthKeychain.m index 51e2f955334..544d1718d80 100644 --- a/FirebaseMessaging/Sources/Token/FIRMessagingAuthKeychain.m +++ b/FirebaseMessaging/Sources/Token/FIRMessagingAuthKeychain.m @@ -92,7 +92,7 @@ - (NSMutableDictionary *)keychainQueryForService:(NSString *)service account:(NS NSMutableDictionary *keychainQuery = [self keychainQueryForService:service account:account]; NSMutableArray *results; keychainQuery[(__bridge id)kSecReturnData] = (__bridge id)kCFBooleanTrue; -#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION keychainQuery[(__bridge id)kSecReturnAttributes] = (__bridge id)kCFBooleanTrue; keychainQuery[(__bridge id)kSecMatchLimit] = (__bridge id)kSecMatchLimitAll; // FIRMessagingKeychain should only take a query and return a result, will handle the query here. diff --git a/Firestore/core/src/remote/connectivity_monitor_apple.mm b/Firestore/core/src/remote/connectivity_monitor_apple.mm index 3fccfc6ef16..282733cd405 100644 --- a/Firestore/core/src/remote/connectivity_monitor_apple.mm +++ b/Firestore/core/src/remote/connectivity_monitor_apple.mm @@ -18,8 +18,7 @@ #if defined(__APPLE__) -#if TARGET_OS_IOS || TARGET_OS_TV || \ - (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION #import #endif @@ -50,7 +49,7 @@ NetworkStatus ToNetworkStatus(SCNetworkReachabilityFlags flags) { return NetworkStatus::Unavailable; } -#if TARGET_OS_IPHONE || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IPHONE || TARGET_OS_VISION if (flags & kSCNetworkReachabilityFlagsIsWWAN) { return NetworkStatus::AvailableViaCellular; } @@ -113,8 +112,7 @@ explicit ConnectivityMonitorApple( return; } -#if TARGET_OS_IOS || TARGET_OS_TV || \ - (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION this->observer_ = [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationWillEnterForegroundNotification object:nil @@ -126,8 +124,7 @@ explicit ConnectivityMonitorApple( } ~ConnectivityMonitorApple() { -#if TARGET_OS_IOS || TARGET_OS_TV || \ - (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION [[NSNotificationCenter defaultCenter] removeObserver:this->observer_]; #endif @@ -142,8 +139,7 @@ explicit ConnectivityMonitorApple( } } -#if TARGET_OS_IOS || TARGET_OS_TV || \ - (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION void OnEnteredForeground() { SCNetworkReachabilityFlags flags{}; if (!SCNetworkReachabilityGetFlags(reachability_, &flags)) return; @@ -171,8 +167,7 @@ void OnReachabilityChanged(SCNetworkReachabilityFlags flags) { private: SCNetworkReachabilityRef reachability_ = nil; -#if TARGET_OS_IOS || TARGET_OS_TV || \ - (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION id observer_ = nil; #endif }; diff --git a/Firestore/core/src/util/filesystem_apple.mm b/Firestore/core/src/util/filesystem_apple.mm index 9802017a6f8..5a553476e8a 100644 --- a/Firestore/core/src/util/filesystem_apple.mm +++ b/Firestore/core/src/util/filesystem_apple.mm @@ -45,8 +45,7 @@ } StatusOr Filesystem::AppDataDir(absl::string_view app_name) { -#if TARGET_OS_IOS || TARGET_OS_OSX || \ - (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_OSX || TARGET_OS_VISION NSArray* directories = NSSearchPathForDirectoriesInDomains( NSApplicationSupportDirectory, NSUserDomainMask, YES); return Path::FromNSString(directories[0]).AppendUtf8(app_name); @@ -62,7 +61,7 @@ } StatusOr Filesystem::LegacyDocumentsDir(absl::string_view app_name) { -#if TARGET_OS_IOS || (defined(TARGET_OS_VISION) && TARGET_OS_VISION) +#if TARGET_OS_IOS || TARGET_OS_VISION NSArray* directories = NSSearchPathForDirectoriesInDomains( NSDocumentDirectory, NSUserDomainMask, YES); return Path::FromNSString(directories[0]).AppendUtf8(app_name); diff --git a/SwiftPM-PlatformExclude/FirebaseFirestoreWrap/dummy.m b/SwiftPM-PlatformExclude/FirebaseFirestoreWrap/dummy.m index dfc56395493..4b3c19101cf 100644 --- a/SwiftPM-PlatformExclude/FirebaseFirestoreWrap/dummy.m +++ b/SwiftPM-PlatformExclude/FirebaseFirestoreWrap/dummy.m @@ -17,7 +17,7 @@ #warning "Firebase Firestore does not support watchOS" #endif -#if (defined(TARGET_OS_VISION) && TARGET_OS_VISION) && FIREBASE_BINARY_FIRESTORE +#if TARGET_OS_VISION && FIREBASE_BINARY_FIRESTORE #error "Firebase Firestore's binary SPM distribution does not support \ visionOS. To enable the source distribution, quit Xcode and open the desired \ project from the command line with the FIREBASE_SOURCE_FIRESTORE environment \ diff --git a/SwiftPM-PlatformExclude/FirebaseInAppMessagingWrap/dummy.m b/SwiftPM-PlatformExclude/FirebaseInAppMessagingWrap/dummy.m index df4b2c913bd..d58ce4ca51c 100644 --- a/SwiftPM-PlatformExclude/FirebaseInAppMessagingWrap/dummy.m +++ b/SwiftPM-PlatformExclude/FirebaseInAppMessagingWrap/dummy.m @@ -13,6 +13,6 @@ // limitations under the License. #import -#if !(TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)) +#if !(TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION) #warning "Firebase In App Messaging only supports the iOS, tvOS and visionOS platforms." #endif