From 0fc55e3bba74eca82a4bb87af474735629bc753b Mon Sep 17 00:00:00 2001 From: FabianLars Date: Thu, 27 Feb 2025 13:28:59 +0100 Subject: [PATCH 1/5] chore(deps): Update objc2 to 0.6 --- .changes/objc06.md | 8 +++++++ Cargo.lock | 28 ++++++++++++------------ plugins/log/Cargo.toml | 4 ++-- plugins/opener/Cargo.toml | 4 ++-- plugins/opener/src/reveal_item_in_dir.rs | 2 +- plugins/updater/src/updater.rs | 5 ++++- 6 files changed, 31 insertions(+), 20 deletions(-) create mode 100644 .changes/objc06.md diff --git a/.changes/objc06.md b/.changes/objc06.md new file mode 100644 index 0000000000..3d50c8e870 --- /dev/null +++ b/.changes/objc06.md @@ -0,0 +1,8 @@ +--- +log: patch +log-js: patch +opener: patch +opener-js: patch +--- + +Update `objc2` crate to 0.6. No user facing changes. diff --git a/Cargo.lock b/Cargo.lock index 31406b1c6b..2db92e0877 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1866,7 +1866,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2461,17 +2461,17 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "global-hotkey" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00d88f1be7bf4cd2e61623ce08e84be2dfa4eab458e5d632d3dab95f16c1f64" +checksum = "41fbb3a4e56c901ee66c190fdb3fa08344e6d09593cc6c61f8eb9add7144b271" dependencies = [ "crossbeam-channel", "keyboard-types", - "objc2 0.5.2", - "objc2-app-kit 0.2.2", + "objc2 0.6.0", + "objc2-app-kit 0.3.0", "once_cell", "serde", - "thiserror 1.0.69", + "thiserror 2.0.9", "windows-sys 0.59.0", "x11-dl", ] @@ -3378,7 +3378,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -4869,7 +4869,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6728,8 +6728,8 @@ dependencies = [ "byte-unit", "fern", "log", - "objc2 0.5.2", - "objc2-foundation 0.2.2", + "objc2 0.6.0", + "objc2-foundation 0.3.0", "serde", "serde_json", "serde_repr", @@ -6781,8 +6781,8 @@ version = "2.2.5" dependencies = [ "dunce", "glob", - "objc2-app-kit 0.2.2", - "objc2-foundation 0.2.2", + "objc2-app-kit 0.3.0", + "objc2-foundation 0.3.0", "open", "schemars", "serde", @@ -7125,7 +7125,7 @@ dependencies = [ "fastrand", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -8155,7 +8155,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] diff --git a/plugins/log/Cargo.toml b/plugins/log/Cargo.toml index e1cec49991..c7a7c90b4d 100644 --- a/plugins/log/Cargo.toml +++ b/plugins/log/Cargo.toml @@ -39,8 +39,8 @@ android_logger = "0.14" [target."cfg(target_os = \"ios\")".dependencies] swift-rs = "1" -objc2 = "0.5" -objc2-foundation = { version = "0.2", default-features = false, features = [ +objc2 = "0.6" +objc2-foundation = { version = "0.3", default-features = false, features = [ "std", "NSString", ] } diff --git a/plugins/opener/Cargo.toml b/plugins/opener/Cargo.toml index 9c5b53c87b..06e487d12d 100644 --- a/plugins/opener/Cargo.toml +++ b/plugins/opener/Cargo.toml @@ -54,12 +54,12 @@ zbus = { workspace = true } url = { workspace = true } [target."cfg(target_os = \"macos\")".dependencies.objc2-app-kit] -version = "0.2" +version = "0.3" default-features = false features = ["std", "NSWorkspace"] [target."cfg(target_os = \"macos\")".dependencies.objc2-foundation] -version = "0.2" +version = "0.3" default-features = false features = ["std", "NSURL", "NSArray", "NSString"] diff --git a/plugins/opener/src/reveal_item_in_dir.rs b/plugins/opener/src/reveal_item_in_dir.rs index 6d7b9268d5..6e3dfc2c80 100644 --- a/plugins/opener/src/reveal_item_in_dir.rs +++ b/plugins/opener/src/reveal_item_in_dir.rs @@ -185,7 +185,7 @@ mod imp { let path = path.to_string_lossy(); let path = NSString::from_str(&path); let urls = vec![NSURL::fileURLWithPath(&path)]; - let urls = NSArray::from_vec(urls); + let urls = NSArray::from_retained_slice(&urls); let workspace = NSWorkspace::new(); workspace.activateFileViewerSelectingURLs(&urls); diff --git a/plugins/updater/src/updater.rs b/plugins/updater/src/updater.rs index a3e3cb3a98..e14b6cd2c1 100644 --- a/plugins/updater/src/updater.rs +++ b/plugins/updater/src/updater.rs @@ -4,7 +4,7 @@ use std::{ collections::HashMap, - ffi::{OsStr, OsString}, + ffi::OsString, io::Cursor, path::{Path, PathBuf}, str::FromStr, @@ -12,6 +12,9 @@ use std::{ time::Duration, }; +#[cfg(not(target_os = "macos"))] +use std::ffi::CStr; + use base64::Engine; use futures_util::StreamExt; use http::HeaderName; From 67b572bc34824102535f1d2e1d95aa4dcf55f7fd Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Thu, 27 Feb 2025 13:41:28 +0100 Subject: [PATCH 2/5] Update updater.rs --- plugins/updater/src/updater.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/updater/src/updater.rs b/plugins/updater/src/updater.rs index e14b6cd2c1..21acc73261 100644 --- a/plugins/updater/src/updater.rs +++ b/plugins/updater/src/updater.rs @@ -13,7 +13,7 @@ use std::{ }; #[cfg(not(target_os = "macos"))] -use std::ffi::CStr; +use std::ffi::OsStr; use base64::Engine; use futures_util::StreamExt; From 4251013ad9e132542a8254289c2ca006e5991853 Mon Sep 17 00:00:00 2001 From: FabianLars Date: Thu, 27 Feb 2025 14:06:23 +0100 Subject: [PATCH 3/5] fix test(?) --- plugins/updater/tests/updater-migration/tests/update.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/updater/tests/updater-migration/tests/update.rs b/plugins/updater/tests/updater-migration/tests/update.rs index 56cb2d300e..e41023cea6 100644 --- a/plugins/updater/tests/updater-migration/tests/update.rs +++ b/plugins/updater/tests/updater-migration/tests/update.rs @@ -173,8 +173,6 @@ mod v2 { if bundle_updater { #[cfg(windows)] command.args(["--bundles", "msi", "nsis"]); - - command.args(["--bundles", "updater"]); } else { #[cfg(windows)] command.args(["--bundles", target.name()]); From 2a915ee58b824d9a54375ead1d324fe9942af740 Mon Sep 17 00:00:00 2001 From: FabianLars Date: Thu, 27 Feb 2025 14:25:50 +0100 Subject: [PATCH 4/5] idk what i'm doing --- plugins/updater/tests/updater-migration/tests/update.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/updater/tests/updater-migration/tests/update.rs b/plugins/updater/tests/updater-migration/tests/update.rs index e41023cea6..813da3c61f 100644 --- a/plugins/updater/tests/updater-migration/tests/update.rs +++ b/plugins/updater/tests/updater-migration/tests/update.rs @@ -67,8 +67,6 @@ mod v1 { if bundle_updater { #[cfg(windows)] command.args(["--bundles", "msi", "nsis"]); - - command.args(["--bundles", "updater"]); } else { #[cfg(windows)] command.args(["--bundles", target.name()]); From 9e3386beeb76300878118a572c6168c682e87200 Mon Sep 17 00:00:00 2001 From: FabianLars Date: Thu, 27 Feb 2025 14:33:20 +0100 Subject: [PATCH 5/5] hmm --- plugins/updater/tests/app-updater/tests/update.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/updater/tests/app-updater/tests/update.rs b/plugins/updater/tests/app-updater/tests/update.rs index 230ab3763c..d308b31737 100644 --- a/plugins/updater/tests/app-updater/tests/update.rs +++ b/plugins/updater/tests/app-updater/tests/update.rs @@ -63,8 +63,6 @@ fn build_app(cwd: &Path, config: &Config, bundle_updater: bool, target: BundleTa if bundle_updater { #[cfg(windows)] command.args(["--bundles", "msi", "nsis"]); - - command.args(["--bundles", "updater"]); } else { #[cfg(windows)] command.args(["--bundles", target.name()]);