Skip to content

Commit

Permalink
[visionOS] Fix FirebaseInAppMessaging build on Xcode 15.1 beta 1 (#11935
Browse files Browse the repository at this point in the history
)
  • Loading branch information
andrewheard authored Oct 13, 2023
1 parent 85f4f03 commit 9425f60
Show file tree
Hide file tree
Showing 37 changed files with 74 additions and 74 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.h"

Expand Down Expand Up @@ -174,4 +174,4 @@ - (void)logAnalyticsEventForType:(FIRIAMAnalyticsLogEventType)eventType
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseCore/Extension/FirebaseCoreInternal.h"

Expand Down Expand Up @@ -204,4 +204,4 @@ - (void)sendClearcutHttpRequestForLogs:(NSArray<FIRIAMClearcutLogRecord *> *)log
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import <UIKit/UIKit.h>

Expand Down Expand Up @@ -209,4 +209,4 @@ - (BOOL)saveIntoCacheWithPath:(NSString *)cacheFilePath {
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseCore/Extension/FirebaseCoreInternal.h"

Expand Down Expand Up @@ -214,4 +214,4 @@ - (void)logAnalyticsEventForType:(FIRIAMAnalyticsLogEventType)eventType
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import <UIKit/UIKit.h>
#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
Expand Down Expand Up @@ -245,4 +245,4 @@ - (void)scheduleNextSend {

@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseCore/Extension/FirebaseCoreInternal.h"

Expand Down Expand Up @@ -399,4 +399,4 @@ - (NSString *)sanitizedURLStringFromString:(NSString *)string {

@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseCore/Extension/FirebaseCoreInternal.h"

Expand Down Expand Up @@ -206,4 +206,4 @@ - (void)fetchImageFromURL:(NSURL *)imageURL

@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
4 changes: 2 additions & 2 deletions FirebaseInAppMessaging/Sources/Data/FIRIAMMessageDefinition.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageDefinition.h"

Expand Down Expand Up @@ -109,4 +109,4 @@ - (BOOL)messageHasStarted {
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMRenderingEffectSetting.h"

Expand All @@ -34,4 +34,4 @@ + (instancetype)getDefaultRenderingEffectSetting {
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseInAppMessaging/Sources/Private/DisplayTrigger/FIRIAMDisplayTriggerDefinition.h"

Expand Down Expand Up @@ -43,4 +43,4 @@ - (instancetype)initWithFirebaseAnalyticEvent:(NSString *)title {
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
4 changes: 2 additions & 2 deletions FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import <Foundation/Foundation.h>
#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"

NSString *const kFirebaseInAppMessagingErrorDomain = @"com.firebase.inappmessaging";
FIRLoggerService kFIRLoggerInAppMessaging = @"[FirebaseInAppMessaging]";

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
4 changes: 2 additions & 2 deletions FirebaseInAppMessaging/Sources/FIRInAppMessaging.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseInAppMessaging/Sources/Public/FirebaseInAppMessaging/FIRInAppMessaging.h"

Expand Down Expand Up @@ -145,4 +145,4 @@ - (void)triggerEvent:(NSString *)eventName {

@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
4 changes: 2 additions & 2 deletions FirebaseInAppMessaging/Sources/Flows/FIRIAMActivityLogger.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import <UIKit/UIKit.h>

Expand Down Expand Up @@ -245,4 +245,4 @@ - (void)addLogRecord:(FIRIAMActivityRecord *)newRecord {
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
4 changes: 2 additions & 2 deletions FirebaseInAppMessaging/Sources/Flows/FIRIAMBookKeeper.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseCore/Extension/FirebaseCoreInternal.h"

Expand Down Expand Up @@ -262,4 +262,4 @@ - (void)cleanupFetchRecords {
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
#import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h"
Expand Down Expand Up @@ -133,4 +133,4 @@ - (NSString *)getIAMSDKVersion {
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
#import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
Expand Down Expand Up @@ -68,4 +68,4 @@ - (void)stop {

@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseCore/Extension/FirebaseCoreInternal.h"

Expand Down Expand Up @@ -67,4 +67,4 @@ - (void)dealloc {
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseCore/Extension/FirebaseCoreInternal.h"

Expand Down Expand Up @@ -64,4 +64,4 @@ - (void)dealloc {
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckTriggerFlow.h"

Expand All @@ -34,4 +34,4 @@ - (void)stop {
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
4 changes: 2 additions & 2 deletions FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import <UIKit/UIKit.h>
#import "FirebaseCore/Extension/FirebaseCoreInternal.h"
Expand Down Expand Up @@ -778,4 +778,4 @@ - (void)checkAndDisplayNextAppForegroundMessage {
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
4 changes: 2 additions & 2 deletions FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchFlow.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseCore/Extension/FirebaseCoreInternal.h"

Expand Down Expand Up @@ -267,4 +267,4 @@ - (void)checkForAppLaunchMessage {
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseCore/Extension/FirebaseCoreInternal.h"

Expand Down Expand Up @@ -61,4 +61,4 @@ - (void)dealloc {
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseCore/Extension/FirebaseCoreInternal.h"

Expand Down Expand Up @@ -236,4 +236,4 @@ - (void)loadMessageDataFromServerFetchStorage:(FIRIAMServerMsgFetchStorage *)fet
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseCore/Extension/FirebaseCoreInternal.h"

Expand Down Expand Up @@ -277,4 +277,4 @@ - (void)fetchMessagesWithImpressionList:(NSArray<FIRIAMImpressionRecord *> *)imp
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import "FirebaseCore/Extension/FirebaseCoreInternal.h"

Expand Down Expand Up @@ -66,4 +66,4 @@ - (void)readResponseDictionary:(void (^)(NSDictionary *response, BOOL success))c
}
@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#import <TargetConditionals.h>
#if TARGET_OS_IOS || TARGET_OS_TV
#if TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)

#import <Foundation/Foundation.h>

Expand Down Expand Up @@ -371,4 +371,4 @@ - (instancetype)initWithActionText:(nullable NSString *)actionText

@end

#endif // TARGET_OS_IOS || TARGET_OS_TV
#endif // TARGET_OS_IOS || TARGET_OS_TV || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)
Loading

0 comments on commit 9425f60

Please sign in to comment.