Support Apple Vision Pro

.github/workflows/test.yml

@@ -45,6 +45,9 @@ jobs:
       matrix:
         os: [ macOS-13, macOS-14 ]
         sim: [ tvOS, watchOS ]
+        include:
+          - os: macos-14
+            sim: visionOS
     runs-on: ${{matrix.os}}
 
     steps:

.travis.apple-third-tier.sh

@@ -96,7 +96,9 @@ then
      if [ "$(uname -m)" = "arm64" ]; then
          title "••••• Darwin: visionOS simulator tests •••••"
          title "boot a simulator"
-         xcrun simctl list devicetypes vision
+         xcrun simctl list devices vision
+         system_profiler SPDeveloperToolsDataType
+         xcodebuild -showsdks
          VISIONOS_DEVICE_TYPE=$(xcrun simctl list devicetypes vision -j | jq -r '.devicetypes[0].identifier')
          VISIONOS_RUNTIME_ID=$(xcrun simctl list runtimes | grep visionOS | cut -d ' ' -f 7 | tail -1)
          export VISIONOS_SIM_ID=$(xcrun simctl create My-apple-vision-pro $VISIONOS_DEVICE_TYPE $VISIONOS_RUNTIME_ID)

dinghy-lib/src/apple/mod.rs

@@ -34,13 +34,15 @@ pub enum AppleSimulatorType {
     Ios,
     Watchos,
     Tvos,
+    Visionos,
 }
 impl Display for AppleSimulatorType {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let val = match self {
             AppleSimulatorType::Ios => "ios",
             AppleSimulatorType::Watchos => "watchos",
             AppleSimulatorType::Tvos => "tvos",
+            AppleSimulatorType::Visionos => "visionos",
         };
         f.write_str(val)
     }
@@ -197,6 +199,49 @@ impl PlatformManager for TvosManager {
     }
 }
 
+pub struct VisionosManager {
+    devices: Vec<Box<dyn Device>>,
+}
+
+impl VisionosManager {
+    pub fn new() -> Result<Option<Self>> {
+        let devices = simulators(AppleSimulatorType::Visionos)?;
+        Ok(Some(Self { devices }))
+    }
+}
+
+impl PlatformManager for VisionosManager {
+    fn devices(&self) -> Result<Vec<Box<dyn Device>>> {
+        Ok(self.devices.clone())
+    }
+
+    fn platforms(&self) -> Result<Vec<Box<dyn Platform>>> {
+        ["aarch64", "aarch64-sim"]
+            .iter()
+            .map(|arch| {
+                let id = format!("auto-visionos-{}", arch);
+                let rustc_triple = if *arch != "aarch64-sim" {
+                    format!("{}-apple-visionos", arch)
+                } else {
+                    format!("aarch64-apple-visionos-sim")
+                };
+                let simulator = if *arch == "aarch64-sim" {
+                    Some(AppleSimulatorType::Visionos)
+                } else {
+                    None
+                };
+                AppleDevicePlatform::new(
+                    id,
+                    &rustc_triple,
+                    simulator,
+                    crate::config::PlatformConfiguration::default(),
+                )
+                .map(|pf| pf as Box<dyn Platform>)
+            })
+            .collect()
+    }
+}
+
 fn simulators(sim_type: AppleSimulatorType) -> Result<Vec<Box<dyn Device>>> {
     let sims_list = ::std::process::Command::new("xcrun")
         .args(&[

dinghy-lib/src/apple/platform.rs

@@ -54,6 +54,12 @@ impl AppleDevicePlatform {
             Some(AppleSimulatorType::Watchos) => {
                 "watchsimulator"
             }
+            Some(AppleSimulatorType::Visionos) => {
+                // xros and xrsimulator are sdk names.
+                // See https://github.com/rust-lang/rust/pull/121419#discussion_r1501908152 for
+                // more inconsistencies about visionOS and xrOS.
+                "xrsimulator"
+            }
             None => "iphoneos"
         };
         let xcrun = process::Command::new("xcrun")

dinghy-lib/src/apple/xcode.rs

@@ -48,6 +48,12 @@ pub fn add_plist_to_app(
             writeln!(plist, "<key>WKApplication</key><true/>",)?;
             writeln!(plist, "<key>WKWatchOnly</key><true/>")?;
         }
+        Some(AppleSimulatorType::Visionos) => {
+            writeln!(
+                plist,
+                "<key>UIDeviceFamily</key> <array> <integer>7</integer> </array>"
+            )?;
+        }
     }
     writeln!(plist, r#"</dict></plist>"#)?;
     Ok(())

dinghy-lib/src/lib.rs

@@ -28,6 +28,7 @@ use crate::apple::{
     IosManager,
     TvosManager,
     WatchosManager,
+    VisionosManager,
 };
 
 use crate::platform::regular_platform::RegularPlatform;
@@ -71,6 +72,9 @@ impl Dinghy {
             if let Some(man) = WatchosManager::new().context("Could not initialize tvOS manager")? {
                 managers.push(Box::new(man));
             }
+            if let Some(man) = VisionosManager::new().context("Could not initialize tvOS manager")? {
+                managers.push(Box::new(man));
+            }
         }
 
         let mut devices = vec![];

dinghy-test/src/lib.rs

@@ -9,6 +9,7 @@ pub fn test_project_path() -> PathBuf {
             target_os = "ios",
             target_os = "watchos",
             target_os = "tvos",
+            target_os = "visionos",
             target_os = "android"
         )) || env::var("DINGHY").is_ok() {
         let current_exe = env::current_exe().expect("Current exe path not accessible");
@@ -37,6 +38,7 @@ pub fn try_test_file_path(test_data_id: &str) -> Option<PathBuf> {
             target_os = "ios",
             target_os = "watchos",
             target_os = "tvos",
+            target_os = "visionos",
             target_os = "android"
         )) || env::var("DINGHY").is_ok() {
         current_exe