diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 4539a4e..9354be3 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1319,34 +1319,13 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", -] - [[package]] name = "dirs" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" dependencies = [ - "dirs-sys 0.5.0", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users 0.4.6", - "windows-sys 0.48.0", + "dirs-sys", ] [[package]] @@ -1357,8 +1336,8 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", "option-ext", - "redox_users 0.5.2", - "windows-sys 0.59.0", + "redox_users", + "windows-sys 0.61.2", ] [[package]] @@ -3137,13 +3116,13 @@ name = "moonsound" version = "0.1.0" dependencies = [ "base64 0.22.1", - "block2 0.5.1", + "block2 0.6.2", "cocoa 0.26.0", - "dirs 5.0.1", + "dirs", "entity", "migration", - "objc2 0.5.2", - "objc2-foundation 0.2.2", + "objc2 0.6.3", + "objc2-foundation 0.3.2", "objc2-media-player", "rodio", "sea-orm", @@ -3158,7 +3137,7 @@ dependencies = [ "tauri-plugin-os", "tauri-plugin-window-state", "tokio", - "window-vibrancy 0.5.3", + "window-vibrancy", ] [[package]] @@ -3458,6 +3437,17 @@ dependencies = [ "objc2-quartz-core 0.3.2", ] +[[package]] +name = "objc2-av-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478ae33fcac9df0a18db8302387c666b8ef08a3e2d62b510ca4fc278a384b6c0" +dependencies = [ + "bitflags 2.6.0", + "objc2 0.6.3", + "objc2-foundation 0.3.2", +] + [[package]] name = "objc2-cloud-kit" version = "0.3.2" @@ -3627,15 +3617,17 @@ dependencies = [ [[package]] name = "objc2-media-player" -version = "0.2.2" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee7e398f352d50d8016c73969878942efb422030884a744180a2d2b8b341de" +checksum = "85f2a98483f6e76313cb85a5a185eaa3cda86a177b13a8852d56cbd0085bf635" dependencies = [ "bitflags 2.6.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-app-kit 0.2.2", - "objc2-foundation 0.2.2", + "block2 0.6.2", + "objc2 0.6.3", + "objc2-app-kit 0.3.2", + "objc2-av-foundation", + "objc2-core-foundation", + "objc2-foundation 0.3.2", ] [[package]] @@ -4436,17 +4428,6 @@ dependencies = [ "bitflags 2.6.0", ] -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom 0.2.15", - "libredox", - "thiserror 1.0.69", -] - [[package]] name = "redox_users" version = "0.5.2" @@ -4735,7 +4716,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.11.0", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6122,7 +6103,7 @@ dependencies = [ "anyhow", "bytes", "cookie", - "dirs 6.0.0", + "dirs", "dunce", "embed_plist", "getrandom 0.3.4", @@ -6160,7 +6141,7 @@ dependencies = [ "url", "webkit2gtk", "webview2-com", - "window-vibrancy 0.6.0", + "window-vibrancy", "windows 0.61.3", ] @@ -6172,7 +6153,7 @@ checksum = "a924b6c50fe83193f0f8b14072afa7c25b7a72752a2a73d9549b463f5fe91a38" dependencies = [ "anyhow", "cargo_toml", - "dirs 6.0.0", + "dirs", "glob", "heck 0.5.0", "json-patch", @@ -6805,7 +6786,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3d5572781bee8e3f994d7467084e1b1fd7a93ce66bd480f8156ba89dee55a2b" dependencies = [ "crossbeam-channel", - "dirs 6.0.0", + "dirs", "libappindicator", "muda", "objc2 0.6.3", @@ -7369,20 +7350,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "window-vibrancy" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831ad7678290beae36be6f9fad9234139c7f00f3b536347de7745621716be82d" -dependencies = [ - "objc2 0.5.2", - "objc2-app-kit 0.2.2", - "objc2-foundation 0.2.2", - "raw-window-handle", - "windows-sys 0.59.0", - "windows-version", -] - [[package]] name = "window-vibrancy" version = "0.6.0" @@ -7973,7 +7940,7 @@ dependencies = [ "block2 0.6.2", "cookie", "crossbeam-channel", - "dirs 6.0.0", + "dirs", "dpi", "dunce", "gdkx11", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index c478998..d361b0b 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -29,20 +29,20 @@ serde_json = "1.0.145" symphonia = { git = "https://github.com/pdeljanov/Symphonia.git", branch = "dev-0.6", features = ["all"] } tauri-plugin-dialog = "2.4.0" rodio = {version = "0.20.1", features = ["symphonia-all"] } -window-vibrancy = "0.5.3" +window-vibrancy = "0.6.0" tauri-plugin-window-state = "2.4.0" tauri-plugin-decorum = "1.1.1" tauri-plugin-os = "2.3.1" base64 = "0.22.1" sea-orm = { version = "1.1.17", features = [ "sqlx-sqlite", "runtime-async-std-rustls", "macros" ] } -dirs = "5.0.1" +dirs = "6.0.0" tokio = { version = "1.48.0", features = ["full"] } [target."cfg(target_os = \"macos\")".dependencies] cocoa = "0.26" -objc2-media-player = { version = "0.2.2", features = ["all"] } -block2 = "0.5.1" -objc2 = "0.5.2" -objc2-foundation = "0.2.2" +objc2-media-player = "0.3.2" +block2 = "0.6.2" +objc2 = "0.6.3" +objc2-foundation = "0.3.2" [workspace] diff --git a/src-tauri/src/macos_interop/now_playing.rs b/src-tauri/src/macos_interop/now_playing.rs index 189763a..126c301 100644 --- a/src-tauri/src/macos_interop/now_playing.rs +++ b/src-tauri/src/macos_interop/now_playing.rs @@ -116,7 +116,7 @@ pub fn set_now_playing(metadata: crate::music::core::MetadataResult) { .to_string(), ))), ]; - let dictionary = objc2_foundation::NSDictionary::from_id_slice(keys, owned_objects); + let dictionary = objc2_foundation::NSDictionary::from_retained_objects(keys, owned_objects); MPNowPlayingInfoCenter::setNowPlayingInfo(&*default, Some(dictionary.as_ref())); MPNowPlayingInfoCenter::setPlaybackState(&*default, MPNowPlayingPlaybackState::Playing); }