Add support for visionOS

amodm · Apr 23, 2024 · e9bfcac · e9bfcac
1 parent a16d6ae
commit e9bfcac
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -35,7 +35,7 @@ core-foundation = "0.9"
 jni = "0.21"
 ndk-context = "0.1"
 
-[target.'cfg(target_os = "ios")'.dependencies]
+[target.'cfg(any(target_os = "ios", target_os = "tvos", target_os = "visionos"))'.dependencies]
 raw-window-handle = "0.5.0"
 objc = "0.2.7"
 

diff --git a/src/ios.rs b/src/ios.rs
@@ -1,7 +1,9 @@
 use crate::{Browser, BrowserOptions, Error, ErrorKind, Result, TargetType};
 use objc::{class, msg_send, runtime::Object, sel, sel_impl};
 
-/// Deal with opening of browsers on iOS
+/// Deal with opening of browsers on iOS/tvOS/visionOS.
+///
+/// watchOS doesn't have a browser, so this won't work there.
 pub(super) fn open_browser_internal(
     _browser: Browser,
     target: &TargetType,

diff --git a/src/lib.rs b/src/lib.rs
@@ -14,14 +14,14 @@
 //!
 //! ## Platform Support Status
 //!
-//! | Platform | Supported | Browsers | Test status |
-//! |----------|-----------|----------|-------------|
-//! | macos    | ✅        | default + [others](https://docs.rs/webbrowser/latest/webbrowser/enum.Browser.html) | ✅ |
-//! | windows  | ✅        | default only | ✅ |
-//! | linux/wsl | ✅       | default only (respects $BROWSER env var, so can be used with other browsers) | ✅ |
-//! | android  | ✅        | default only | ✅ |
-//! | ios      | ✅        | default only | ✅ |
-//! | wasm     | ✅        | default only | ✅ |
+//! | Platform              | Supported | Browsers | Test status |
+//! |-----------------------|-----------|----------|-------------|
+//! | macOS                 | ✅        | default + [others](https://docs.rs/webbrowser/latest/webbrowser/enum.Browser.html) | ✅ |
+//! | windows               | ✅        | default only | ✅ |
+//! | linux/wsl             | ✅        | default only (respects $BROWSER env var, so can be used with other browsers) | ✅ |
+//! | android               | ✅        | default only | ✅ |
+//! | iOS/tvOS/visionOS     | ✅        | default only | ✅ |
+//! | wasm                  | ✅        | default only | ✅ |
 //! | unix (*bsd, aix etc.) | ✅        | default only (respects $BROWSER env var, so can be used with other browsers) | Manual |
 //!
 //! ## Consistent Behaviour
@@ -39,7 +39,10 @@
 //! * `disable-wsl` - this disables WSL `file` implementation (`http` still works)
 //! * `wasm-console` - this enables logging to wasm console (valid only on wasm platform)
 
-#[cfg_attr(any(target_os = "ios", target_os = "tvos"), path = "ios.rs")]
+#[cfg_attr(
+    any(target_os = "ios", target_os = "tvos", target_os = "visionos"),
+    path = "ios.rs"
+)]
 #[cfg_attr(target_os = "macos", path = "macos.rs")]
 #[cfg_attr(target_os = "android", path = "android.rs")]
 #[cfg_attr(target_family = "wasm", path = "wasm.rs")]
@@ -50,6 +53,7 @@
         not(any(
             target_os = "ios",
             target_os = "tvos",
+            target_os = "visionos",
             target_os = "macos",
             target_os = "android",
             target_family = "wasm",
@@ -67,6 +71,7 @@ mod os;
         not(any(
             target_os = "ios",
             target_os = "tvos",
+            target_os = "visionos",
             target_os = "macos",
             target_os = "android",
             target_family = "wasm",
@@ -316,6 +321,7 @@ pub fn open_browser_with_options(
     if cfg!(any(
         target_os = "ios",
         target_os = "tvos",
+        target_os = "visionos",
         target_os = "macos",
         target_os = "android",
         target_family = "wasm",
@@ -338,6 +344,8 @@ impl TargetType {
         feature = "hardened",
         target_os = "android",
         target_os = "ios",
+        target_os = "tvos",
+        target_os = "visionos",
         target_family = "wasm"
     ))]
     fn is_http(&self) -> bool {
@@ -346,7 +354,13 @@ impl TargetType {
 
     /// If `target` represents a valid http/https url, return the str corresponding to it
     /// else return `std::io::Error` of kind `std::io::ErrorKind::InvalidInput`
-    #[cfg(any(target_os = "android", target_os = "ios", target_family = "wasm"))]
+    #[cfg(any(
+        target_os = "android",
+        target_os = "ios",
+        target_os = "tvos",
+        target_os = "visionos",
+        target_family = "wasm"
+    ))]
     fn get_http_url(&self) -> Result<&str> {
         if self.is_http() {
             Ok(self.0.as_str())