chore(deps): Update objc2 to 0.6 (#2469)

pull/2468/head
Fabian-Lars 3 months ago committed by GitHub
parent 71f95c9f05
commit 1a9846599b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -0,0 +1,8 @@
---
log: patch
log-js: patch
opener: patch
opener-js: patch
---
Update `objc2` crate to 0.6. No user facing changes.

28
Cargo.lock generated

@ -1866,7 +1866,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
dependencies = [ dependencies = [
"libc", "libc",
"windows-sys 0.59.0", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@ -2461,17 +2461,17 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]] [[package]]
name = "global-hotkey" name = "global-hotkey"
version = "0.6.3" version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b00d88f1be7bf4cd2e61623ce08e84be2dfa4eab458e5d632d3dab95f16c1f64" checksum = "41fbb3a4e56c901ee66c190fdb3fa08344e6d09593cc6c61f8eb9add7144b271"
dependencies = [ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"keyboard-types", "keyboard-types",
"objc2 0.5.2", "objc2 0.6.0",
"objc2-app-kit 0.2.2", "objc2-app-kit 0.3.0",
"once_cell", "once_cell",
"serde", "serde",
"thiserror 1.0.69", "thiserror 2.0.9",
"windows-sys 0.59.0", "windows-sys 0.59.0",
"x11-dl", "x11-dl",
] ]
@ -3378,7 +3378,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"windows-targets 0.52.6", "windows-targets 0.48.5",
] ]
[[package]] [[package]]
@ -4869,7 +4869,7 @@ dependencies = [
"once_cell", "once_cell",
"socket2", "socket2",
"tracing", "tracing",
"windows-sys 0.59.0", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@ -6728,8 +6728,8 @@ dependencies = [
"byte-unit", "byte-unit",
"fern", "fern",
"log", "log",
"objc2 0.5.2", "objc2 0.6.0",
"objc2-foundation 0.2.2", "objc2-foundation 0.3.0",
"serde", "serde",
"serde_json", "serde_json",
"serde_repr", "serde_repr",
@ -6781,8 +6781,8 @@ version = "2.2.5"
dependencies = [ dependencies = [
"dunce", "dunce",
"glob", "glob",
"objc2-app-kit 0.2.2", "objc2-app-kit 0.3.0",
"objc2-foundation 0.2.2", "objc2-foundation 0.3.0",
"open", "open",
"schemars", "schemars",
"serde", "serde",
@ -7125,7 +7125,7 @@ dependencies = [
"fastrand", "fastrand",
"once_cell", "once_cell",
"rustix", "rustix",
"windows-sys 0.59.0", "windows-sys 0.52.0",
] ]
[[package]] [[package]]
@ -8155,7 +8155,7 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [ dependencies = [
"windows-sys 0.59.0", "windows-sys 0.48.0",
] ]
[[package]] [[package]]

@ -39,8 +39,8 @@ android_logger = "0.14"
[target."cfg(target_os = \"ios\")".dependencies] [target."cfg(target_os = \"ios\")".dependencies]
swift-rs = "1" swift-rs = "1"
objc2 = "0.5" objc2 = "0.6"
objc2-foundation = { version = "0.2", default-features = false, features = [ objc2-foundation = { version = "0.3", default-features = false, features = [
"std", "std",
"NSString", "NSString",
] } ] }

@ -54,12 +54,12 @@ zbus = { workspace = true }
url = { workspace = true } url = { workspace = true }
[target."cfg(target_os = \"macos\")".dependencies.objc2-app-kit] [target."cfg(target_os = \"macos\")".dependencies.objc2-app-kit]
version = "0.2" version = "0.3"
default-features = false default-features = false
features = ["std", "NSWorkspace"] features = ["std", "NSWorkspace"]
[target."cfg(target_os = \"macos\")".dependencies.objc2-foundation] [target."cfg(target_os = \"macos\")".dependencies.objc2-foundation]
version = "0.2" version = "0.3"
default-features = false default-features = false
features = ["std", "NSURL", "NSArray", "NSString"] features = ["std", "NSURL", "NSArray", "NSString"]

@ -185,7 +185,7 @@ mod imp {
let path = path.to_string_lossy(); let path = path.to_string_lossy();
let path = NSString::from_str(&path); let path = NSString::from_str(&path);
let urls = vec![NSURL::fileURLWithPath(&path)]; let urls = vec![NSURL::fileURLWithPath(&path)];
let urls = NSArray::from_vec(urls); let urls = NSArray::from_retained_slice(&urls);
let workspace = NSWorkspace::new(); let workspace = NSWorkspace::new();
workspace.activateFileViewerSelectingURLs(&urls); workspace.activateFileViewerSelectingURLs(&urls);

@ -4,7 +4,7 @@
use std::{ use std::{
collections::HashMap, collections::HashMap,
ffi::{OsStr, OsString}, ffi::OsString,
io::Cursor, io::Cursor,
path::{Path, PathBuf}, path::{Path, PathBuf},
str::FromStr, str::FromStr,
@ -12,6 +12,9 @@ use std::{
time::Duration, time::Duration,
}; };
#[cfg(not(target_os = "macos"))]
use std::ffi::OsStr;
use base64::Engine; use base64::Engine;
use futures_util::StreamExt; use futures_util::StreamExt;
use http::HeaderName; use http::HeaderName;

@ -63,8 +63,6 @@ fn build_app(cwd: &Path, config: &Config, bundle_updater: bool, target: BundleTa
if bundle_updater { if bundle_updater {
#[cfg(windows)] #[cfg(windows)]
command.args(["--bundles", "msi", "nsis"]); command.args(["--bundles", "msi", "nsis"]);
command.args(["--bundles", "updater"]);
} else { } else {
#[cfg(windows)] #[cfg(windows)]
command.args(["--bundles", target.name()]); command.args(["--bundles", target.name()]);

@ -67,8 +67,6 @@ mod v1 {
if bundle_updater { if bundle_updater {
#[cfg(windows)] #[cfg(windows)]
command.args(["--bundles", "msi", "nsis"]); command.args(["--bundles", "msi", "nsis"]);
command.args(["--bundles", "updater"]);
} else { } else {
#[cfg(windows)] #[cfg(windows)]
command.args(["--bundles", target.name()]); command.args(["--bundles", target.name()]);
@ -173,8 +171,6 @@ mod v2 {
if bundle_updater { if bundle_updater {
#[cfg(windows)] #[cfg(windows)]
command.args(["--bundles", "msi", "nsis"]); command.args(["--bundles", "msi", "nsis"]);
command.args(["--bundles", "updater"]);
} else { } else {
#[cfg(windows)] #[cfg(windows)]
command.args(["--bundles", target.name()]); command.args(["--bundles", target.name()]);

Loading…
Cancel
Save