[Environment] Calling '+[GULAppEnvironmentUtil applePlatform]' return…

…s visionOS specific value (#113)
google · Jun 28, 2023 · 58d03d2 · 58d03d2
1 parent 0a24867
commit 58d03d2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 7.11.3 (SwiftPM Only)
+- Calling `+[GULAppEnvironmentUtil applePlatform]` now returns 'visionos' when
+  running on visionOS.
+
 # 7.11.2 (SwiftPM Only)
 - Fix build errors on the visionOS platform. (#108)
 

diff --git a/GoogleUtilities/Environment/Public/GoogleUtilities/GULAppEnvironmentUtil.h b/GoogleUtilities/Environment/Public/GoogleUtilities/GULAppEnvironmentUtil.h
@@ -53,7 +53,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// @return YES if Swift runtime detected in the app.
 + (BOOL)hasSwiftRuntime __deprecated;
 
-/// @return An Apple platform. Possible values "ios", "tvos", "macos", "watchos", "maccatalyst".
+/// @return An Apple platform. Possible values "ios", "tvos", "macos", "watchos", "maccatalyst", and
+/// "visionos".
 + (NSString *)applePlatform;
 
 /// @return An Apple Device platform. Same possible values as `applePlatform`, with the addition of

diff --git a/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.m b/GoogleUtilities/Environment/third_party/GULAppEnvironmentUtil.m
@@ -334,7 +334,7 @@ + (NSString *)applePlatform {
   // `true`, which means the condition list is order-sensitive.
 #if TARGET_OS_MACCATALYST
   applePlatform = @"maccatalyst";
-#elif TARGET_OS_IOS
+#elif TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
 #if defined(__IPHONE_14_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000
   if (@available(iOS 14.0, *)) {
     // Early iOS 14 betas do not include isiOSAppOnMac (#6969)
@@ -353,6 +353,8 @@ + (NSString *)applePlatform {
   applePlatform = @"macos";
 #elif TARGET_OS_WATCH
   applePlatform = @"watchos";
+#elif defined(TARGET_OS_XR) && TARGET_OS_XR
+  applePlatform = @"visionos";
 #endif // TARGET_OS_MACCATALYST
 
   return applePlatform;

diff --git a/GoogleUtilities/Tests/Unit/Environment/GULAppEnvironmentUtilTest.m b/GoogleUtilities/Tests/Unit/Environment/GULAppEnvironmentUtilTest.m
@@ -84,7 +84,7 @@ - (void)testApplePlatform {
   // `true`.
 #if TARGET_OS_MACCATALYST
   NSString *expectedPlatform = @"maccatalyst";
-#elif TARGET_OS_IOS
+#elif TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
   NSString *expectedPlatform = @"ios";
 #endif  // TARGET_OS_MACCATALYST
 
@@ -100,6 +100,10 @@ - (void)testApplePlatform {
   NSString *expectedPlatform = @"watchos";
 #endif  // TARGET_OS_WATCH
 
+#if defined(TARGET_OS_XR) && TARGET_OS_XR
+  NSString *expectedPlatform = @"visionos";
+#endif  // defined(TARGET_OS_XR) && TARGET_OS_XR
+
   XCTAssertEqualObjects([GULAppEnvironmentUtil applePlatform], expectedPlatform);
 }
 
@@ -108,7 +112,7 @@ - (void)testAppleDevicePlatform {
   // `true`.
 #if TARGET_OS_MACCATALYST
   NSString *expectedPlatform = @"maccatalyst";
-#elif TARGET_OS_IOS
+#elif TARGET_OS_IOS && (!defined(TARGET_OS_XR) || !TARGET_OS_XR)
   NSString *expectedPlatform = @"ios";
 
   if ([[UIDevice currentDevice].model.lowercaseString containsString:@"ipad"] ||
@@ -129,6 +133,10 @@ - (void)testAppleDevicePlatform {
   NSString *expectedPlatform = @"watchos";
 #endif  // TARGET_OS_WATCH
 
+#if defined(TARGET_OS_XR) && TARGET_OS_XR
+  NSString *expectedPlatform = @"visionos";
+#endif  // defined(TARGET_OS_XR) && TARGET_OS_XR
+
   XCTAssertEqualObjects([GULAppEnvironmentUtil appleDevicePlatform], expectedPlatform);
 }