Merge remote-tracking branch 'origin/dev' into refactor/custom-protoc…

…ol-response

.changes/fix-ios-logs.md

@@ -0,0 +1,6 @@
+---
+"tauri-cli": patch:bug
+"@tauri-apps/cli": patch:bug
+---
+
+Fixes a regression on alpha.11 where iOS logs aren't being displayed when using `ios dev` with a real device.

tooling/cli/Cargo.toml

@@ -39,7 +39,7 @@ name = "cargo-tauri"
 path = "src/main.rs"
 
 [dependencies]
-tauri-mobile = { version = "0.5.2", default-features = false }
+tauri-mobile = { version = "0.5.3", default-features = false }
 textwrap = { version = "0.11.0", features = [ "term_size" ] }
 jsonrpsee = { version = "0.16", features = [ "server" ] }
 jsonrpsee-core = "0.16"

tooling/cli/src/interface/mod.rs

@@ -95,7 +95,7 @@ pub trait Interface: Sized {
     options: Options,
     on_exit: F,
   ) -> crate::Result<()>;
-  fn mobile_dev<R: Fn(MobileOptions) -> crate::Result<Box<dyn DevProcess>>>(
+  fn mobile_dev<R: Fn(MobileOptions) -> crate::Result<Box<dyn DevProcess + Send>>>(
     &mut self,
     options: MobileOptions,
     runner: R,

tooling/cli/src/interface/rust.rs

@@ -197,7 +197,7 @@ impl Interface for Rust {
     }
   }
 
-  fn mobile_dev<R: Fn(MobileOptions) -> crate::Result<Box<dyn DevProcess>>>(
+  fn mobile_dev<R: Fn(MobileOptions) -> crate::Result<Box<dyn DevProcess + Send>>>(
     &mut self,
     mut options: MobileOptions,
     runner: R,
@@ -431,7 +431,7 @@ impl Rust {
     options: Options,
     run_args: Vec<String>,
     on_exit: F,
-  ) -> crate::Result<Box<dyn DevProcess>> {
+  ) -> crate::Result<Box<dyn DevProcess + Send>> {
     desktop::run_dev(
       options,
       run_args,
@@ -441,10 +441,10 @@ impl Rust {
       self.product_name.clone(),
       on_exit,
     )
-    .map(|c| Box::new(c) as Box<dyn DevProcess>)
+    .map(|c| Box::new(c) as Box<dyn DevProcess + Send>)
   }
 
-  fn run_dev_watcher<F: Fn(&mut Rust) -> crate::Result<Box<dyn DevProcess>>>(
+  fn run_dev_watcher<F: Fn(&mut Rust) -> crate::Result<Box<dyn DevProcess + Send>>>(
     &mut self,
     config: Option<String>,
     run: Arc<F>,

tooling/cli/src/migrate/manifest.rs

@@ -225,6 +225,7 @@ mod tests {
       .as_array()
       .expect("features must be an array")
       .clone();
+
     if toml.contains("reqwest-native-tls-vendored") {
       assert!(
         features
@@ -233,10 +234,22 @@ mod tests {
         "reqwest-native-tls-vendored was not replaced with native-tls-vendored"
       );
     }
+
+    if toml.contains("system-tray") {
+      assert!(
+        features
+          .iter()
+          .any(|f| f.as_str().expect("feature must be a string") == "tray-icon"),
+        "system-tray was not replaced with tray-icon"
+      );
+    }
+
     for feature in features.iter() {
       let feature = feature.as_str().expect("feature must be a string");
       assert!(
-        keep_features.contains(&feature) || feature == "native-tls-vendored",
+        keep_features.contains(&feature)
+          || feature == "native-tls-vendored"
+          || feature == "tray-icon",
         "feature {feature} should have been removed"
       );
     }

tooling/cli/src/mobile/android/dev.rs

@@ -235,7 +235,7 @@ fn run_dev(
             crate::dev::wait_dev_process(c.clone(), move |status, reason| {
               crate::dev::on_app_exit(status, reason, exit_on_panic, no_watch)
             });
-            Ok(Box::new(c) as Box<dyn DevProcess>)
+            Ok(Box::new(c) as Box<dyn DevProcess + Send>)
           }
           Err(e) => {
             crate::dev::kill_before_dev_process();

tooling/cli/src/mobile/ios/dev.rs

@@ -221,7 +221,7 @@ fn run_dev(
             crate::dev::wait_dev_process(c.clone(), move |status, reason| {
               crate::dev::on_app_exit(status, reason, exit_on_panic, no_watch)
             });
-            Ok(Box::new(c) as Box<dyn DevProcess>)
+            Ok(Box::new(c) as Box<dyn DevProcess + Send>)
           }
           Err(e) => {
             crate::dev::kill_before_dev_process();