Skip to content

Commit 87d1a39

Browse files
FabianLarsgezihuzi
authored andcommitted
chore(deps): Update objc2 to 0.6 (tauri-apps#2469)
1 parent fd10aaa commit 87d1a39

File tree

8 files changed

+31
-26
lines changed

8 files changed

+31
-26
lines changed

.changes/objc06.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
log: patch
3+
log-js: patch
4+
opener: patch
5+
opener-js: patch
6+
---
7+
8+
Update `objc2` crate to 0.6. No user facing changes.

Cargo.lock

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/log/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ android_logger = "0.14"
3939

4040
[target."cfg(target_os = \"ios\")".dependencies]
4141
swift-rs = "1"
42-
objc2 = "0.5"
43-
objc2-foundation = { version = "0.2", default-features = false, features = [
42+
objc2 = "0.6"
43+
objc2-foundation = { version = "0.3", default-features = false, features = [
4444
"std",
4545
"NSString",
4646
] }

plugins/opener/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ zbus = { workspace = true }
5454
url = { workspace = true }
5555

5656
[target."cfg(target_os = \"macos\")".dependencies.objc2-app-kit]
57-
version = "0.2"
57+
version = "0.3"
5858
default-features = false
5959
features = ["std", "NSWorkspace"]
6060

6161
[target."cfg(target_os = \"macos\")".dependencies.objc2-foundation]
62-
version = "0.2"
62+
version = "0.3"
6363
default-features = false
6464
features = ["std", "NSURL", "NSArray", "NSString"]
6565

plugins/opener/src/reveal_item_in_dir.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ mod imp {
185185
let path = path.to_string_lossy();
186186
let path = NSString::from_str(&path);
187187
let urls = vec![NSURL::fileURLWithPath(&path)];
188-
let urls = NSArray::from_vec(urls);
188+
let urls = NSArray::from_retained_slice(&urls);
189189

190190
let workspace = NSWorkspace::new();
191191
workspace.activateFileViewerSelectingURLs(&urls);

plugins/updater/src/updater.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@
44

55
use std::{
66
collections::HashMap,
7-
ffi::{OsStr, OsString},
7+
ffi::OsString,
88
io::Cursor,
99
path::{Path, PathBuf},
1010
str::FromStr,
1111
sync::Arc,
1212
time::Duration,
1313
};
1414

15+
#[cfg(not(target_os = "macos"))]
16+
use std::ffi::OsStr;
17+
1518
use base64::Engine;
1619
use futures_util::StreamExt;
1720
use http::HeaderName;

plugins/updater/tests/app-updater/tests/update.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ fn build_app(cwd: &Path, config: &Config, bundle_updater: bool, target: BundleTa
6363
if bundle_updater {
6464
#[cfg(windows)]
6565
command.args(["--bundles", "msi", "nsis"]);
66-
67-
command.args(["--bundles", "updater"]);
6866
} else {
6967
#[cfg(windows)]
7068
command.args(["--bundles", target.name()]);

plugins/updater/tests/updater-migration/tests/update.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ mod v1 {
6767
if bundle_updater {
6868
#[cfg(windows)]
6969
command.args(["--bundles", "msi", "nsis"]);
70-
71-
command.args(["--bundles", "updater"]);
7270
} else {
7371
#[cfg(windows)]
7472
command.args(["--bundles", target.name()]);
@@ -173,8 +171,6 @@ mod v2 {
173171
if bundle_updater {
174172
#[cfg(windows)]
175173
command.args(["--bundles", "msi", "nsis"]);
176-
177-
command.args(["--bundles", "updater"]);
178174
} else {
179175
#[cfg(windows)]
180176
command.args(["--bundles", target.name()]);

0 commit comments

Comments
 (0)