[visionOS] Replace TARGET_OS_XR with TARGET_OS_VISION (#11603)

In Xcode 15 beta 5, TARGET_OS_XR was replaced with TARGET_OS_VISION in ObjC and os(xrOS) was replaced with os(visionOS) in Swift.
firebase · Jul 26, 2023 · e740072 · e740072
1 parent 3676437
commit e740072
Show file tree

Hide file tree

Showing 27 changed files with 101 additions and 86 deletions.
diff --git a/Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.m b/Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.m
@@ -242,7 +242,7 @@ static FIRCLSMachOSegmentCommand FIRCLSBinaryImageMachOGetSegmentCommand(
 
   return segmentCommand;
 }
-#if !CLS_TARGET_OS_XR
+#if !CLS_TARGET_OS_VISION
 static bool FIRCLSBinaryImageMachOSliceInitSectionByName(FIRCLSMachOSliceRef slice,
                                                          const char* segName,
                                                          const char* sectionName,
@@ -345,7 +345,7 @@ static bool FIRCLSBinaryImageFillInImageDetails(FIRCLSBinaryImageDetails* detail
   FIRCLSMachOSection section;
 
 #if CLS_COMPACT_UNWINDING_SUPPORTED
-#if !CLS_TARGET_OS_XR
+#if !CLS_TARGET_OS_VISION
   if (FIRCLSBinaryImageMachOSliceInitSectionByName(&details->slice, SEG_TEXT, "__unwind_info",
                                                    &section)) {
     details->node.unwindInfo = (void*)(section.addr + details->vmaddr_slide);
@@ -358,7 +358,7 @@ static bool FIRCLSBinaryImageFillInImageDetails(FIRCLSBinaryImageDetails* detail
 #endif
 
 #if CLS_DWARF_UNWINDING_SUPPORTED
-#if !CLS_TARGET_OS_XR
+#if !CLS_TARGET_OS_VISION
   if (FIRCLSBinaryImageMachOSliceInitSectionByName(&details->slice, SEG_TEXT, "__eh_frame",
                                                    &section)) {
     details->node.ehFrame = (void*)(section.addr + details->vmaddr_slide);
@@ -370,7 +370,7 @@ static bool FIRCLSBinaryImageFillInImageDetails(FIRCLSBinaryImageDetails* detail
 #endif
 #endif
 
-#if !CLS_TARGET_OS_XR
+#if !CLS_TARGET_OS_VISION
   if (FIRCLSBinaryImageMachOSliceInitSectionByName(&details->slice, SEG_DATA, "__crash_info",
                                                    &section)) {
     details->node.crashInfo = (void*)(section.addr + details->vmaddr_slide);

diff --git a/Crashlytics/Crashlytics/Controllers/FIRCLSNotificationManager.m b/Crashlytics/Crashlytics/Controllers/FIRCLSNotificationManager.m
@@ -39,7 +39,7 @@ - (void)registerNotificationListener {
                                            selector:@selector(didBecomeInactive:)
                                                name:UIApplicationDidEnterBackgroundNotification
                                              object:nil];
-#if !CLS_TARGET_OS_XR
+#if !CLS_TARGET_OS_VISION
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(didChangeOrientation:)
                                                name:UIDeviceOrientationDidChangeNotification
@@ -53,7 +53,7 @@ - (void)registerNotificationListener {
              name:UIApplicationDidChangeStatusBarOrientationNotification
            object:nil];
 #pragma clang diagnostic pop
-#endif  // !CLS_TARGET_OS_XR
+#endif  // !CLS_TARGET_OS_VISION
 
 #elif CLS_TARGET_OS_OSX
   [[NSNotificationCenter defaultCenter] addObserver:self
@@ -68,22 +68,22 @@ - (void)registerNotificationListener {
 }
 
 - (void)captureInitialNotificationStates {
-#if TARGET_OS_IOS && (!CLS_TARGET_OS_XR)
+#if TARGET_OS_IOS && (!CLS_TARGET_OS_VISION)
   UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
   UIInterfaceOrientation statusBarOrientation =
       [FIRCLSApplicationSharedInstance() statusBarOrientation];
-#endif  // TARGET_OS_IOS && (!CLS_TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!CLS_TARGET_OS_VISION)
 
   // It's nice to do this async, so we don't hold up the main thread while doing three
   // consecutive IOs here.
   dispatch_async(FIRCLSGetLoggingQueue(), ^{
     FIRCLSUserLoggingWriteInternalKeyValue(FIRCLSInBackgroundKey, @"0");
-#if TARGET_OS_IOS && (!CLS_TARGET_OS_XR)
+#if TARGET_OS_IOS && (!CLS_TARGET_OS_VISION)
     FIRCLSUserLoggingWriteInternalKeyValue(FIRCLSDeviceOrientationKey,
                                            [@(orientation) description]);
     FIRCLSUserLoggingWriteInternalKeyValue(FIRCLSUIOrientationKey,
                                            [@(statusBarOrientation) description]);
-#endif  // TARGET_OS_IOS && (!CLS_TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!CLS_TARGET_OS_VISION)
   });
 }
 
@@ -95,7 +95,7 @@ - (void)didBecomeInactive:(NSNotification *)notification {
   FIRCLSUserLoggingRecordInternalKeyValue(FIRCLSInBackgroundKey, @YES);
 }
 
-#if TARGET_OS_IOS && (!CLS_TARGET_OS_XR)
+#if TARGET_OS_IOS && (!CLS_TARGET_OS_VISION)
 - (void)didChangeOrientation:(NSNotification *)notification {
   UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
 
@@ -108,6 +108,6 @@ - (void)didChangeUIOrientation:(NSNotification *)notification {
 
   FIRCLSUserLoggingRecordInternalKeyValue(FIRCLSUIOrientationKey, @(statusBarOrientation));
 }
-#endif  // TARGET_OS_IOS && (!CLS_TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!CLS_TARGET_OS_VISION)
 
 @end
diff --git a/Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h b/Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h
@@ -58,10 +58,10 @@
 #endif
 
 // VisionOS support
-#if defined(TARGET_OS_XR) && TARGET_OS_XR
-#define CLS_TARGET_OS_XR 1
+#if defined(TARGET_OS_VISION) && TARGET_OS_VISION
+#define CLS_TARGET_OS_VISION 1
 #else
-#define CLS_TARGET_OS_XR 0
+#define CLS_TARGET_OS_VISION 0
 #endif
 
 #if defined(__arm__)

diff --git a/Crashlytics/Shared/FIRCLSMachO/FIRCLSMachO.m b/Crashlytics/Shared/FIRCLSMachO/FIRCLSMachO.m
@@ -267,7 +267,7 @@ struct FIRCLSMachOSlice FIRCLSMachOSliceGetCurrent(void) {
   void* executableSymbol;
   Dl_info dlinfo;
 
-#if !CLS_TARGET_OS_XR
+#if !CLS_TARGET_OS_VISION
   const NXArchInfo* archInfo;
   archInfo = NXGetLocalArchInfo();
 
@@ -342,7 +342,7 @@ struct FIRCLSMachOSlice FIRCLSMachOSliceWithHeader(void* machHeader) {
     return "armv7k";
   }
 
-#if !CLS_TARGET_OS_XR
+#if !CLS_TARGET_OS_VISION
   const NXArchInfo* archInfo;
 
   archInfo = NXGetArchInfoFromCpuType(slice->cputype, slice->cpusubtype);

diff --git a/Crashlytics/UnitTests/FIRCLSMachO/FIRCLSMachOTests.m b/Crashlytics/UnitTests/FIRCLSMachO/FIRCLSMachOTests.m
@@ -317,7 +317,7 @@ - (void)testReadArmv7kSection {
   XCTAssert(ptr != NULL);
 }
 
-#if !CLS_TARGET_OS_XR
+#if !CLS_TARGET_OS_VISION
 - (void)testReadArm64Section {
   NSString* path = [[self resourcePath] stringByAppendingPathComponent:@"armv7-armv7s-arm64.dylib"];
   struct FIRCLSMachOFile file;
@@ -340,7 +340,7 @@ - (void)testReadArm64Section {
 }
 #endif
 
-#if CLS_TARGET_OS_XR
+#if CLS_TARGET_OS_VISION
 
 - (void)testVisionProGetSlice {
   struct FIRCLSMachOSlice slice = FIRCLSMachOSliceGetCurrent();

diff --git a/FirebaseAuth/Sources/Auth/FIRAuth.m b/FirebaseAuth/Sources/Auth/FIRAuth.m
@@ -475,9 +475,9 @@ - (instancetype)initWithApp:(FIRApp *)app {
                      appCheck:FIR_COMPONENT(FIRAppCheckInterop, app.container)];
   if (self) {
     _app = app;
-#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
     _authURLPresenter = [[FIRAuthURLPresenter alloc] init];
-#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
   }
   return self;
 }
@@ -654,7 +654,7 @@ - (nullable FIRUser *)currentUser {
 - (void)signInWithProvider:(id<FIRFederatedAuthProvider>)provider
                 UIDelegate:(nullable id<FIRAuthUIDelegate>)UIDelegate
                 completion:(nullable FIRAuthDataResultCallback)completion {
-#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
   dispatch_async(FIRAuthGlobalWorkQueue(), ^{
     FIRAuthDataResultCallback decoratedCallback =
         [self signInFlowAuthDataResultCallbackByDecoratingCallback:completion];
@@ -671,7 +671,7 @@ - (void)signInWithProvider:(id<FIRFederatedAuthProvider>)provider
                                                                         callback:decoratedCallback];
                                }];
   });
-#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
 }
 
 - (void)fetchSignInMethodsForEmail:(nonnull NSString *)email
@@ -1875,11 +1875,11 @@ - (BOOL)canHandleNotification:(NSDictionary *)userInfo {
 
 - (BOOL)canHandleURL:(NSURL *)URL {
   __block BOOL result = NO;
-#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
   dispatch_sync(FIRAuthGlobalWorkQueue(), ^{
     result = [self->_authURLPresenter canHandleURL:URL];
   });
-#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
   return result;
 }
 

diff --git a/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m
@@ -149,7 +149,7 @@ + (instancetype)providerWithProviderID:(NSString *)providerID auth:(FIRAuth *)au
   return [[self alloc] initWithProviderID:providerID auth:auth];
 }
 
-#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
 - (void)getCredentialWithUIDelegate:(nullable id<FIRAuthUIDelegate>)UIDelegate
                          completion:(nullable FIRAuthCredentialCallback)completion {
   if (![FIRAuthWebUtils isCallbackSchemeRegisteredForCustomURLScheme:self->_callbackScheme]) {
@@ -216,7 +216,7 @@ - (void)getCredentialWithUIDelegate:(nullable id<FIRAuthUIDelegate>)UIDelegate
                           }];
   });
 }
-#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
 
 #pragma mark - Internal Methods
 

diff --git a/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m
@@ -15,7 +15,7 @@
  */
 
 #import <TargetConditionals.h>
-#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
 
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthSettings.h"
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactorResolver.h"
@@ -789,4 +789,4 @@ - (void)reCAPTCHAURLWithEventID:(NSString *)eventID completion:(FIRReCAPTCHAURLC
 
 NS_ASSUME_NONNULL_END
 
-#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
diff --git a/FirebaseAuth/Sources/Public/FirebaseAuth/FIRFederatedAuthProvider.h b/FirebaseAuth/Sources/Public/FirebaseAuth/FIRFederatedAuthProvider.h
@@ -50,10 +50,10 @@ typedef void (^FIRAuthCredentialCallback)(FIRAuthCredential *_Nullable credentia
     API_UNAVAILABLE(macos,
                     tvos,
                     watchos
-#if defined(TARGET_OS_XR)
+#if defined(TARGET_OS_VISION)
                     ,
-                    xros
-#endif  // defined(TARGET_OS_XR)
+                    visionos
+#endif  // defined(TARGET_OS_VISION)
     );
 
 @end

diff --git a/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m b/FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m
@@ -79,9 +79,9 @@ - (void)getTokenWithCallback:(FIRAuthAPNSTokenCallback)callback {
     } else {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
       [self->_application registerForRemoteNotificationTypes:UIRemoteNotificationTypeAlert];
-#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
 #pragma clang diagnostic pop
     }
   });

diff --git a/FirebaseAuth/Sources/SystemService/FIRAuthNotificationManager.m b/FirebaseAuth/Sources/SystemService/FIRAuthNotificationManager.m
@@ -115,7 +115,7 @@ - (void)checkNotificationForwardingWithCallback:(FIRAuthNotificationForwardingCa
                   didReceiveRemoteNotification:proberNotification
                         fetchCompletionHandler:^(UIBackgroundFetchResult result){
                         }];
-#if !TARGET_OS_TV && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if !TARGET_OS_TV && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
     } else if ([self->_application.delegate
                    respondsToSelector:@selector(application:didReceiveRemoteNotification:)]) {
 // iOS 10 deprecation
@@ -124,7 +124,7 @@ - (void)checkNotificationForwardingWithCallback:(FIRAuthNotificationForwardingCa
       [self->_application.delegate application:self->_application
                   didReceiveRemoteNotification:proberNotification];
 #pragma clang diagnostic pop
-#endif  // !TARGET_OS_TV && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // !TARGET_OS_TV && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
     } else {
       FIRLogWarning(kFIRLoggerAuth, @"I-AUT000015",
                     @"The UIApplicationDelegate must handle remote notification for phone number "

diff --git a/FirebaseAuth/Sources/User/FIRUser.m b/FirebaseAuth/Sources/User/FIRUser.m
@@ -850,7 +850,7 @@ - (void)reauthenticateWithCredential:(FIRAuthCredential *)credential
 - (void)reauthenticateWithProvider:(id<FIRFederatedAuthProvider>)provider
                         UIDelegate:(nullable id<FIRAuthUIDelegate>)UIDelegate
                         completion:(nullable FIRAuthDataResultCallback)completion {
-#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
   dispatch_async(FIRAuthGlobalWorkQueue(), ^{
     [provider getCredentialWithUIDelegate:UIDelegate
                                completion:^(FIRAuthCredential *_Nullable credential,
@@ -863,7 +863,7 @@ - (void)reauthenticateWithProvider:(id<FIRFederatedAuthProvider>)provider
                                                          completion:completion];
                                }];
   });
-#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
 }
 
 - (nullable NSString *)refreshToken {
@@ -1339,7 +1339,7 @@ - (void)linkWithCredential:(FIRAuthCredential *)credential
 - (void)linkWithProvider:(id<FIRFederatedAuthProvider>)provider
               UIDelegate:(nullable id<FIRAuthUIDelegate>)UIDelegate
               completion:(nullable FIRAuthDataResultCallback)completion {
-#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
   dispatch_async(FIRAuthGlobalWorkQueue(), ^{
     [provider getCredentialWithUIDelegate:UIDelegate
                                completion:^(FIRAuthCredential *_Nullable credential,
@@ -1351,7 +1351,7 @@ - (void)linkWithProvider:(id<FIRFederatedAuthProvider>)provider
                                  [self linkWithCredential:credential completion:completion];
                                }];
   });
-#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
 }
 
 - (void)unlinkFromProvider:(NSString *)provider

diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m b/FirebaseAuth/Sources/Utilities/FIRAuthDefaultUIDelegate.m
@@ -91,14 +91,14 @@ - (void)dismissViewControllerAnimated:(BOOL)flag completion:(nullable void (^)(v
       }
     }
   } else {
-#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
     UIApplication *application = [applicationClass sharedApplication];
 // iOS 13 deprecation
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
     topViewController = application.keyWindow.rootViewController;
 #pragma clang diagnostic pop
-#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
   }
 #else
   UIApplication *application = [applicationClass sharedApplication];

diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthURLPresenter.h b/FirebaseAuth/Sources/Utilities/FIRAuthURLPresenter.h
@@ -15,7 +15,7 @@
  */
 
 #import <TargetConditionals.h>
-#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
 
 #import <Foundation/Foundation.h>
 
@@ -66,4 +66,4 @@ typedef BOOL (^FIRAuthURLCallbackMatcher)(NSURL *_Nullable callbackURL);
 
 NS_ASSUME_NONNULL_END
 
-#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthURLPresenter.m b/FirebaseAuth/Sources/Utilities/FIRAuthURLPresenter.m
@@ -15,7 +15,7 @@
  */
 
 #import <TargetConditionals.h>
-#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
 
 #import <SafariServices/SafariServices.h>
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthUIDelegate.h"
@@ -205,4 +205,4 @@ - (void)finishPresentationWithURL:(nullable NSURL *)URL error:(nullable NSError
 
 NS_ASSUME_NONNULL_END
 
-#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthWebView.h b/FirebaseAuth/Sources/Utilities/FIRAuthWebView.h
@@ -15,7 +15,7 @@
  */
 
 #import <TargetConditionals.h>
-#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
 
 #import <UIKit/UIKit.h>
 #import <WebKit/WebKit.h>
@@ -41,4 +41,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 NS_ASSUME_NONNULL_END
 
-#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthWebView.m b/FirebaseAuth/Sources/Utilities/FIRAuthWebView.m
@@ -15,7 +15,7 @@
  */
 
 #import <TargetConditionals.h>
-#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
 
 #import "FirebaseAuth/Sources/Utilities/FIRAuthWebView.h"
 
@@ -101,4 +101,4 @@ - (UIActivityIndicatorView *)createSpinner {
 
 NS_ASSUME_NONNULL_END
 
-#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
diff --git a/FirebaseAuth/Sources/Utilities/FIRAuthWebViewController.m b/FirebaseAuth/Sources/Utilities/FIRAuthWebViewController.m
@@ -15,7 +15,7 @@
  */
 
 #import <TargetConditionals.h>
-#if TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)
 
 #import "FirebaseAuth/Sources/Utilities/FIRAuthWebView.h"
 #import "FirebaseAuth/Sources/Utilities/FIRAuthWebViewController.h"
@@ -115,4 +115,4 @@ - (void)webView:(WKWebView *)webView
 
 NS_ASSUME_NONNULL_END
 
-#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
+#endif  // TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION)