From 1f496cedeb2a0a6b4b7dd15bb1bdc42cfa3598ff Mon Sep 17 00:00:00 2001
From: osy <50960678+osy@users.noreply.github.com>
Date: Tue, 8 Aug 2023 23:30:10 -0700
Subject: [PATCH] project: add visionOS support for conditionals

---
 Configuration/QEMUConstant.swift                       |  2 +-
 Configuration/UTMQemuConfiguration+Arguments.swift     |  4 ++--
 Platform/Main.swift                                    |  4 ++--
 Platform/Shared/BigButtonStyle.swift                   |  2 +-
 Platform/Shared/ContentView.swift                      |  2 +-
 Platform/Shared/DestructiveButton.swift                |  4 ++--
 Platform/Shared/GlobalFileImporter.swift               |  4 ++--
 Platform/Shared/VMConfigQEMUView.swift                 |  2 +-
 Platform/Shared/VMConfigSystemView.swift               |  2 +-
 Platform/Shared/VMContextMenuModifier.swift            |  2 +-
 Platform/Shared/VMNavigationListView.swift             |  2 +-
 Platform/Shared/VMReleaseNotesView.swift               |  4 ++--
 Platform/Shared/VMRemovableDrivesView.swift            |  2 +-
 Platform/Shared/VMSettingsAddDeviceMenuView.swift      |  2 +-
 Platform/Shared/VMWizardDrivesView.swift               |  2 +-
 Platform/Shared/VMWizardHardwareView.swift             |  2 +-
 Platform/Shared/VMWizardOSLinuxView.swift              |  2 +-
 Platform/Shared/VMWizardOSOtherView.swift              |  2 +-
 Platform/Shared/VMWizardOSView.swift                   |  2 +-
 Platform/Shared/VMWizardOSWindowsView.swift            |  2 +-
 Platform/Shared/VMWizardSharingView.swift              |  2 +-
 Platform/Shared/VMWizardStartView.swift                |  4 ++--
 Platform/UTMData.swift                                 |  4 ++--
 Platform/UTMReleaseHelper.swift                        |  2 +-
 Services/UTMExtensions.swift                           |  4 ++--
 UTM.xcodeproj/project.pbxproj                          | 10 +++++-----
 .../xcshareddata/swiftpm/Package.resolved              | 10 ++++------
 27 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/Configuration/QEMUConstant.swift b/Configuration/QEMUConstant.swift
index 0e931afb..79610728 100644
--- a/Configuration/QEMUConstant.swift
+++ b/Configuration/QEMUConstant.swift
@@ -439,7 +439,7 @@ extension QEMUArchitecture {
     
     /// TSO is supported on jailbroken iOS devices with Hypervisor support
     var hasTSOSupport: Bool {
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         return hasHypervisorSupport
         #else
         return false
diff --git a/Configuration/UTMQemuConfiguration+Arguments.swift b/Configuration/UTMQemuConfiguration+Arguments.swift
index 01f03e04..7767da98 100644
--- a/Configuration/UTMQemuConfiguration+Arguments.swift
+++ b/Configuration/UTMQemuConfiguration+Arguments.swift
@@ -30,7 +30,7 @@ import Virtualization // for getting network interfaces
     
     /// Shared between helper and main process to store Unix sockets
     var socketURL: URL {
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         return FileManager.default.temporaryDirectory
         #else
         let appGroup = Bundle.main.infoDictionary?["AppGroupIdentifier"] as? String
@@ -429,7 +429,7 @@ import Virtualization // for getting network interfaces
     }
     
     private var useCoreAudioBackend: Bool {
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         return false
         #else
         // force CoreAudio backend for mac99 which only supports 44100 Hz
diff --git a/Platform/Main.swift b/Platform/Main.swift
index 7b9a948e..6e024b43 100644
--- a/Platform/Main.swift
+++ b/Platform/Main.swift
@@ -34,7 +34,7 @@ class Main {
     static var jitAvailable = true
     
     static func main() {
-        #if os(iOS) && !WITH_QEMU_TCI
+        #if (os(iOS) || os(visionOS)) && !WITH_QEMU_TCI
         // check if we have jailbreak
         if jb_spawn_ptrace_child(CommandLine.argc, CommandLine.unsafeArgv) {
             logger.info("JIT: ptrace() child spawn trick")
@@ -57,7 +57,7 @@ class Main {
         #endif
         // do patches
         UTMPatches.patchAll()
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         // register defaults
         registerDefaultsFromSettingsBundle()
         #endif
diff --git a/Platform/Shared/BigButtonStyle.swift b/Platform/Shared/BigButtonStyle.swift
index 534510a7..744cfc23 100644
--- a/Platform/Shared/BigButtonStyle.swift
+++ b/Platform/Shared/BigButtonStyle.swift
@@ -44,7 +44,7 @@ struct BigButtonStyle: ButtonStyle {
             ZStack {
                 RoundedRectangle(cornerRadius: 10.0)
                     .fill(configuration.isPressed ? pressedColor : defaultColor)
-                    #if os(iOS)
+                    #if os(iOS) || os(visionOS)
                     .hoverEffect()
                     .scaleEffect(configuration.isPressed ? 0.95 : 1)
                     #endif
diff --git a/Platform/Shared/ContentView.swift b/Platform/Shared/ContentView.swift
index b2405c4d..ce971971 100644
--- a/Platform/Shared/ContentView.swift
+++ b/Platform/Shared/ContentView.swift
@@ -16,7 +16,7 @@
 
 import SwiftUI
 import UniformTypeIdentifiers
-#if os(iOS) && !os(visionOS)
+#if os(iOS)
 import IQKeyboardManagerSwift
 #endif
 
diff --git a/Platform/Shared/DestructiveButton.swift b/Platform/Shared/DestructiveButton.swift
index 108aae06..51a754cd 100644
--- a/Platform/Shared/DestructiveButton.swift
+++ b/Platform/Shared/DestructiveButton.swift
@@ -32,7 +32,7 @@ struct DestructiveButton<Label>: View where Label : View {
     
     var body: some View {
         if #available(iOS 15, macOS 12, *) {
-            #if os(iOS)
+            #if os(iOS) || os(visionOS)
             Button(role: .destructive, action: action, label: {
                 label.foregroundColor(.red)
             })
@@ -40,7 +40,7 @@ struct DestructiveButton<Label>: View where Label : View {
             Button(role: .destructive, action: action, label: { label })
             #endif
         } else {
-            #if os(iOS)
+            #if os(iOS) || os(visionOS)
             Button(action: action, label: {
                 label.foregroundColor(.red)
             })
diff --git a/Platform/Shared/GlobalFileImporter.swift b/Platform/Shared/GlobalFileImporter.swift
index 5aeaba13..3b5795a7 100644
--- a/Platform/Shared/GlobalFileImporter.swift
+++ b/Platform/Shared/GlobalFileImporter.swift
@@ -34,12 +34,12 @@ struct GlobalFileImporterViewModifier: ViewModifier {
     @Binding var isPresented: Bool
     let allowedContentTypes: [UTType]
     let onCompletion: (Result<URL, Error>) -> Void
-    #if os(iOS)
+    #if os(iOS) || os(visionOS)
     @EnvironmentObject private var globalFileImporterShim: GlobalFileImporterShim
     #endif
     
     func body(content: Content) -> some View {
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         content
             .onChange(of: isPresented) { newValue in
                 if newValue {
diff --git a/Platform/Shared/VMConfigQEMUView.swift b/Platform/Shared/VMConfigQEMUView.swift
index 1863a2ca..617d7918 100644
--- a/Platform/Shared/VMConfigQEMUView.swift
+++ b/Platform/Shared/VMConfigQEMUView.swift
@@ -73,7 +73,7 @@ struct VMConfigQEMUView: View {
                     Toggle("Use Hypervisor", isOn: $config.hasHypervisor)
                         .help("Only available if host architecture matches the target. Otherwise, TCG emulation is used.")
                         .disabled(!system.architecture.hasHypervisorSupport)
-                    #if os(iOS)
+                    #if os(iOS) || os(visionOS)
                     if config.hasHypervisor {
                         Toggle("Use TSO", isOn: $config.hasTSO)
                             .help("Only available when Hypervisor is used on supported hardware. TSO speeds up Intel emulation in the guest at the cost of decreased performance in general.")
diff --git a/Platform/Shared/VMConfigSystemView.swift b/Platform/Shared/VMConfigSystemView.swift
index 513381d1..8958c666 100644
--- a/Platform/Shared/VMConfigSystemView.swift
+++ b/Platform/Shared/VMConfigSystemView.swift
@@ -94,7 +94,7 @@ struct VMConfigSystemView: View {
             return
         }
         var totalDeviceMemory = ProcessInfo.processInfo.physicalMemory
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         let availableMemory = UInt64(os_proc_available_memory())
         if availableMemory > 0 {
             totalDeviceMemory = availableMemory
diff --git a/Platform/Shared/VMContextMenuModifier.swift b/Platform/Shared/VMContextMenuModifier.swift
index 1d21fade..6c4859dd 100644
--- a/Platform/Shared/VMContextMenuModifier.swift
+++ b/Platform/Shared/VMContextMenuModifier.swift
@@ -107,7 +107,7 @@ struct VMContextMenuModifier: ViewModifier {
                     }.help("Run the VM in the foreground, without saving data changes to disk.")
                 }
                 
-                #if os(iOS)
+                #if os(iOS) || os(visionOS)
                 if let qemuConfig = vm.config as? UTMQemuConfiguration {
                     Button {
                         qemuConfig.qemu.isGuestToolsInstallRequested = true
diff --git a/Platform/Shared/VMNavigationListView.swift b/Platform/Shared/VMNavigationListView.swift
index ac1cb50a..51ac3a6e 100644
--- a/Platform/Shared/VMNavigationListView.swift
+++ b/Platform/Shared/VMNavigationListView.swift
@@ -129,7 +129,7 @@ private struct VMListModifier: ViewModifier {
             }
             #endif
         }
-        #if os(iOS) && !os(visionOS)
+        #if os(iOS)
         // SwiftUI bug on iOS 14.4 and previous versions prevents multiple .sheet from working
         .sheet(isPresented: $sheetPresented) {
             if data.showNewVMSheet {
diff --git a/Platform/Shared/VMReleaseNotesView.swift b/Platform/Shared/VMReleaseNotesView.swift
index dad3e389..aa1e0803 100644
--- a/Platform/Shared/VMReleaseNotesView.swift
+++ b/Platform/Shared/VMReleaseNotesView.swift
@@ -61,7 +61,7 @@ struct VMReleaseNotesView: View {
                         isShowAll = true
                     } label: {
                         Text("Show All")
-                        #if os(iOS)
+                        #if os(iOS) || os(visionOS)
                             .frame(maxWidth: .infinity)
                         #endif
                     }.buttonStyle(ReleaseButtonStyle())
@@ -70,7 +70,7 @@ struct VMReleaseNotesView: View {
                     presentationMode.wrappedValue.dismiss()
                 } label: {
                     Text("Continue")
-                    #if os(iOS)
+                    #if os(iOS) || os(visionOS)
                         .frame(maxWidth: .infinity)
                     #endif
                 }.keyboardShortcut(.defaultAction)
diff --git a/Platform/Shared/VMRemovableDrivesView.swift b/Platform/Shared/VMRemovableDrivesView.swift
index f8163385..73387f9f 100644
--- a/Platform/Shared/VMRemovableDrivesView.swift
+++ b/Platform/Shared/VMRemovableDrivesView.swift
@@ -144,7 +144,7 @@ struct VMRemovableDrivesView: View {
                     Text(url.lastPathComponent)
                         .truncationMode(.head)
                         .lineLimit(1)
-                    #if os(iOS)
+                    #if os(iOS) || os(visionOS)
                     Image(systemName: "chevron.down")
                     #endif
                 }
diff --git a/Platform/Shared/VMSettingsAddDeviceMenuView.swift b/Platform/Shared/VMSettingsAddDeviceMenuView.swift
index 9bcb2c2d..e3d8e012 100644
--- a/Platform/Shared/VMSettingsAddDeviceMenuView.swift
+++ b/Platform/Shared/VMSettingsAddDeviceMenuView.swift
@@ -69,7 +69,7 @@ struct VMSettingsAddDeviceMenuView: View {
             } label: {
                 Label("Sound", systemImage: "speaker.wave.2")
             }.disabled(config.system.architecture.soundDeviceType.allRawValues.isEmpty)
-            #if os(iOS)
+            #if os(iOS) || os(visionOS)
             Divider()
             Button {
                 isImportDriveShown.toggle()
diff --git a/Platform/Shared/VMWizardDrivesView.swift b/Platform/Shared/VMWizardDrivesView.swift
index 5fec48bc..cdcfec39 100644
--- a/Platform/Shared/VMWizardDrivesView.swift
+++ b/Platform/Shared/VMWizardDrivesView.swift
@@ -43,7 +43,7 @@ struct VMWizardDrivesView: View {
             }
             
         }
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         .navigationTitle(Text("Storage"))
         #endif
     }
diff --git a/Platform/Shared/VMWizardHardwareView.swift b/Platform/Shared/VMWizardHardwareView.swift
index 95860e27..1f096368 100644
--- a/Platform/Shared/VMWizardHardwareView.swift
+++ b/Platform/Shared/VMWizardHardwareView.swift
@@ -120,7 +120,7 @@ struct VMWizardHardwareView: View {
                 
             }
         }
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         .navigationTitle(Text("Hardware"))
         #endif
         .textFieldStyle(.roundedBorder)
diff --git a/Platform/Shared/VMWizardOSLinuxView.swift b/Platform/Shared/VMWizardOSLinuxView.swift
index 8ac86f77..355bdbd3 100644
--- a/Platform/Shared/VMWizardOSLinuxView.swift
+++ b/Platform/Shared/VMWizardOSLinuxView.swift
@@ -144,7 +144,7 @@ struct VMWizardOSLinuxView: View {
             
             
         }
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         .navigationTitle(Text("Linux"))
         #endif
         .fileImporter(isPresented: $isFileImporterPresented, allowedContentTypes: [.data], onCompletion: processImage)
diff --git a/Platform/Shared/VMWizardOSOtherView.swift b/Platform/Shared/VMWizardOSOtherView.swift
index 2ecce4c4..e361b774 100644
--- a/Platform/Shared/VMWizardOSOtherView.swift
+++ b/Platform/Shared/VMWizardOSOtherView.swift
@@ -43,7 +43,7 @@ struct VMWizardOSOtherView: View {
                 Text("Advanced")
             }
         }
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         .navigationTitle(Text("Other"))
         #endif
         .fileImporter(isPresented: $isFileImporterPresented, allowedContentTypes: [.data], onCompletion: processImage)
diff --git a/Platform/Shared/VMWizardOSView.swift b/Platform/Shared/VMWizardOSView.swift
index 950fb3e6..0742415b 100644
--- a/Platform/Shared/VMWizardOSView.swift
+++ b/Platform/Shared/VMWizardOSView.swift
@@ -77,7 +77,7 @@ struct VMWizardOSView: View {
             }
 
         }
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         .navigationTitle(Text("Operating System"))
         #endif
         .buttonStyle(.inList)
diff --git a/Platform/Shared/VMWizardOSWindowsView.swift b/Platform/Shared/VMWizardOSWindowsView.swift
index 7d082555..740b43ba 100644
--- a/Platform/Shared/VMWizardOSWindowsView.swift
+++ b/Platform/Shared/VMWizardOSWindowsView.swift
@@ -121,7 +121,7 @@ struct VMWizardOSWindowsView: View {
                 }
             }
         }
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         .navigationTitle(Text("Windows"))
         #endif
         .fileImporter(isPresented: $isFileImporterPresented, allowedContentTypes: [.data], onCompletion: processImage)
diff --git a/Platform/Shared/VMWizardSharingView.swift b/Platform/Shared/VMWizardSharingView.swift
index dc007dbf..88e1ab4b 100644
--- a/Platform/Shared/VMWizardSharingView.swift
+++ b/Platform/Shared/VMWizardSharingView.swift
@@ -38,7 +38,7 @@ struct VMWizardSharingView: View {
                 }
             }
         }
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         .navigationTitle(Text("Shared Directory"))
         #endif
         .fileImporter(isPresented: $isFileImporterPresented, allowedContentTypes: [.folder], onCompletion: processDirectory)
diff --git a/Platform/Shared/VMWizardStartView.swift b/Platform/Shared/VMWizardStartView.swift
index 25742569..733653d2 100644
--- a/Platform/Shared/VMWizardStartView.swift
+++ b/Platform/Shared/VMWizardStartView.swift
@@ -64,7 +64,7 @@ struct VMWizardStartView: View {
                 }
                 .buttonStyle(.inList)
                 .disabled(!isVirtualizationSupported)
-                #if os(iOS)
+                #if os(iOS) || os(visionOS)
                 if #available(iOS 15, *) {
                     virtButton
                 } else {
@@ -131,7 +131,7 @@ struct VMWizardStartView: View {
             }
 
         }
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         .navigationTitle(Text("Start"))
         #endif
     }
diff --git a/Platform/UTMData.swift b/Platform/UTMData.swift
index 86524e66..251ae649 100644
--- a/Platform/UTMData.swift
+++ b/Platform/UTMData.swift
@@ -366,7 +366,7 @@ struct AlertMessage: Identifiable {
     }
     
     func showSettingsForCurrentVM() {
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         // SwiftUI bug: cannot show modal at the same time as changing selected VM or it breaks
         DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100)) {
             self.showSettingsModal = true
@@ -924,7 +924,7 @@ struct AlertMessage: Identifiable {
 
     // MARK - JitStreamer
 
-#if os(iOS)
+#if os(iOS) || os(visionOS)
     @available(iOS 15, *)
     func jitStreamerAttach() async throws {
         let urlString = String(
diff --git a/Platform/UTMReleaseHelper.swift b/Platform/UTMReleaseHelper.swift
index 9223fce5..eff2dcf4 100644
--- a/Platform/UTMReleaseHelper.swift
+++ b/Platform/UTMReleaseHelper.swift
@@ -94,7 +94,7 @@ class UTMReleaseHelper: ObservableObject {
                 let range = match.range(at: 1)
                 let platform = nsString.substring(with: range)
                 let description = nsString.substring(from: match.range.location + match.range.length)
-                #if os(iOS)
+                #if os(iOS) || os(visionOS)
                 #if WITH_QEMU_TCI
                 if platform == "iOS SE" {
                     currentSection.body.append(description)
diff --git a/Services/UTMExtensions.swift b/Services/UTMExtensions.swift
index 15080470..38ca559f 100644
--- a/Services/UTMExtensions.swift
+++ b/Services/UTMExtensions.swift
@@ -331,7 +331,7 @@ struct Setting<T> {
 // MARK: - Bookmark handling
 extension URL {
     private static var defaultCreationOptions: BookmarkCreationOptions {
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         return .minimalBookmark
         #else
         return .withSecurityScope
@@ -339,7 +339,7 @@ extension URL {
     }
     
     private static var defaultResolutionOptions: BookmarkResolutionOptions {
-        #if os(iOS)
+        #if os(iOS) || os(visionOS)
         return []
         #else
         return .withSecurityScope
diff --git a/UTM.xcodeproj/project.pbxproj b/UTM.xcodeproj/project.pbxproj
index 9aa04888..217cfe27 100644
--- a/UTM.xcodeproj/project.pbxproj
+++ b/UTM.xcodeproj/project.pbxproj
@@ -4095,10 +4095,10 @@
 /* Begin XCRemoteSwiftPackageReference section */
 		8399328E272F4A400059355F /* XCRemoteSwiftPackageReference "ZIPFoundation" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/weichsel/ZIPFoundation.git";
+			repositoryURL = "https://github.com/osy/ZIPFoundation.git";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 0.9.9;
+				kind = revision;
+				revision = 6793a6e7c587503aa078ec1246d71ef8fb50733b;
 			};
 		};
 		84018693288B66370050AC51 /* XCRemoteSwiftPackageReference "swiftui-visual-effects" */ = {
@@ -4161,8 +4161,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/apple/swift-log";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.2.0;
+				kind = revision;
+				revision = 5996c7a1b4a3bc972a43f55c78437f23a8eae465;
 			};
 		};
 		CE93759724BB821F0074066F /* XCRemoteSwiftPackageReference "IQKeyboardManager" */ = {
diff --git a/UTM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/UTM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 2dba3fbb..7d3c74f9 100644
--- a/UTM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/UTM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -59,8 +59,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-log",
       "state" : {
-        "revision" : "32e8d724467f8fe623624570367e3d50c5638e46",
-        "version" : "1.5.2"
+        "revision" : "5996c7a1b4a3bc972a43f55c78437f23a8eae465"
       }
     },
     {
@@ -69,7 +68,7 @@
       "location" : "https://github.com/osy/SwiftTerm.git",
       "state" : {
         "branch" : "visionos",
-        "revision" : "0b034bb577190785e44915ac18e5e3f0ba1c993d"
+        "revision" : "ce8e0f17196e0fafa0f150ce129a91a04a97eb85"
       }
     },
     {
@@ -84,10 +83,9 @@
     {
       "identity" : "zipfoundation",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/weichsel/ZIPFoundation.git",
+      "location" : "https://github.com/osy/ZIPFoundation.git",
       "state" : {
-        "revision" : "43ec568034b3731101dbf7670765d671c30f54f3",
-        "version" : "0.9.16"
+        "revision" : "6793a6e7c587503aa078ec1246d71ef8fb50733b"
       }
     }
   ],