Merge pull request #21 from banjun/visionos-userconsent

Fix visionOS UserConsent
banjun · Sep 24, 2024 · 4856978 · 4856978
2 parents 03a40c6 + 13e8144
commit 4856978
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/FrameworkTarget/SwiftHotReload.xcodeproj/project.pbxproj b/FrameworkTarget/SwiftHotReload.xcodeproj/project.pbxproj
@@ -356,7 +356,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
@@ -398,7 +398,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",

diff --git a/Sources/ProxyReloader/UserConsent.swift b/Sources/ProxyReloader/UserConsent.swift
@@ -26,7 +26,11 @@ import UIKit
 extension UserConsent {
     @MainActor
     static func alert(_ title: String, _ message: String) async -> Bool {
-        guard let window = (UIApplication.shared.connectedScenes.compactMap { $0 as? UIWindowScene }.compactMap { $0.windows.first { $0.isKeyWindow } }.first) else {
+        let windowScenes = UIApplication.shared.connectedScenes.compactMap { $0 as? UIWindowScene }
+#if os(visionOS)
+            .filter { $0.session.role != .immersiveSpaceApplication }
+#endif
+        guard let window = (windowScenes.compactMap { $0.windows.first { $0.isKeyWindow } }.first) else {
             NSLog("%@", "⚠️ cannot get keyWindow from scenes = \(UIApplication.shared.connectedScenes)")
             return false
         }