Merge remote-tracking branch 'origin/dev' into fix/ios-logs

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/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();