diff --git a/Cargo.toml b/Cargo.toml index 0c75ccc9..63ee0041 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -87,41 +87,43 @@ markdown = ["iced/markdown"] [dependencies] apply = "0.3.0" -ashpd = { version = "0.9.1", default-features = false, optional = true } +ashpd = { version = "0.9.0", default-features = false, optional = true } async-fs = { version = "2.1", optional = true } cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "178eb0b", optional = true } -chrono = "0.4.35" +chrono = "0.4.39" cosmic-config = { path = "cosmic-config" } cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } -css-color = "0.2.5" -derive_setters = "0.1.5" +css-color = "0.2.8" +derive_setters = "0.1.6" image = { version = "0.25.5", default-features = false, features = [ "jpeg", "png", ] } -lazy_static = "1.4.0" -libc = { version = "0.2.155", optional = true } -license = { version = "3.5.1", optional = true } +lazy_static = "1.5.0" +libc = { version = "0.2.169", optional = true } +license = { version = "3.6.0", optional = true } mime = { version = "0.3.17", optional = true } -palette = "0.7.3" -rfd = { version = "0.14.0", default-features = false, features = ["xdg-portal"], optional = true } -rustix = { version = "0.38.34", features = [ +palette = "0.7.6" +rfd = { version = "0.15.2", default-features = false, features = [ + "xdg-portal", +], optional = true } +rustix = { version = "0.38.44", features = [ "pipe", "process", ], optional = true } -serde = { version = "1.0.180", features = ["derive"] } -slotmap = "1.0.6" -smol = { version = "2.0.0", optional = true } -thiserror = "1.0.44" -tokio = { version = "1.24.2", optional = true } +serde = { version = "1.0.218", features = ["derive"] } +slotmap = "1.0.7" +smol = { version = "2.0.2", optional = true } +thiserror = "2.0.11" +tokio = { version = "1.43.0", optional = true } tracing = "0.1.41" -unicode-segmentation = "1.6" -url = "2.4.0" -zbus = { version = "4.2.1", default-features = false, optional = true } +unicode-segmentation = "1.12" +url = "2.5.4" +zbus = { version = "4.0", default-features = false, optional = true } [target.'cfg(unix)'.dependencies] freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" } -freedesktop-desktop-entry = { version = "0.5.1", optional = true } +freedesktop-desktop-entry = { version = "0.7.7", optional = true } shlex = { version = "1.3.0", optional = true } [dependencies.cosmic-theme] @@ -194,7 +196,7 @@ members = [ exclude = ["iced"] [workspace.dependencies] -dirs = "5.0.1" +dirs = "6.0.0" [patch."https://github.com/pop-os/libcosmic"] diff --git a/cosmic-config-derive/Cargo.toml b/cosmic-config-derive/Cargo.toml index 46d79658..55eeb871 100644 --- a/cosmic-config-derive/Cargo.toml +++ b/cosmic-config-derive/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" proc-macro = true [dependencies] -syn = "1.0" -quote = "1.0" \ No newline at end of file +syn = "2.0" +quote = "1.0" diff --git a/cosmic-config-derive/src/lib.rs b/cosmic-config-derive/src/lib.rs index e1ea70fe..feb49584 100644 --- a/cosmic-config-derive/src/lib.rs +++ b/cosmic-config-derive/src/lib.rs @@ -1,6 +1,6 @@ use proc_macro::TokenStream; use quote::quote; -use syn::{self}; +use syn::{self, LitInt}; #[proc_macro_derive(CosmicConfigEntry, attributes(version, id))] pub fn cosmic_config_entry_derive(input: TokenStream) -> TokenStream { @@ -17,17 +17,19 @@ fn impl_cosmic_config_entry_macro(ast: &syn::DeriveInput) -> TokenStream { let version = attributes .iter() .find_map(|attr| { - if attr.path.is_ident("version") { - match attr.parse_meta() { - Ok(syn::Meta::NameValue(syn::MetaNameValue { - lit: syn::Lit::Int(lit_int), - .. - })) => Some(lit_int.base10_parse::().unwrap()), - _ => None, + let mut version_found = None; + + _ = attr.parse_nested_meta(|meta| { + if meta.path.is_ident("version") { + if let Ok(lit_int) = meta.input.parse::() { + version_found = Some(lit_int.base10_parse::().unwrap()); + } } - } else { - None - } + + Ok(()) + }); + + version_found }) .unwrap_or(0); diff --git a/cosmic-config/Cargo.toml b/cosmic-config/Cargo.toml index 4a9d4944..371ac267 100644 --- a/cosmic-config/Cargo.toml +++ b/cosmic-config/Cargo.toml @@ -11,24 +11,24 @@ subscription = ["iced_futures"] [dependencies] cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true } -zbus = { version = "4.2.1", default-features = false, optional = true } +zbus = { version = "4.0", default-features = false, optional = true } atomicwrites = { git = "https://github.com/jackpot51/rust-atomicwrites" } -calloop = { version = "0.14.0", optional = true } -notify = "6.0.0" -ron = "0.9.0-alpha.0" -serde = "1.0.152" +calloop = { version = "0.14.2", optional = true } +notify = "8.0.0" +ron = "0.9.0-alpha.1" +serde = "1.0.218" cosmic-config-derive = { path = "../cosmic-config-derive/", optional = true } iced = { path = "../iced/", default-features = false, optional = true } iced_futures = { path = "../iced/futures/", default-features = false, optional = true } -once_cell = "1.19.0" +once_cell = "1.20.3" futures-util = { version = "0.3", optional = true } dirs.workspace = true -tokio = { version = "1.0", optional = true, features = ["time"] } -async-std = { version = "1.10", optional = true } +tokio = { version = "1.43", optional = true, features = ["time"] } +async-std = { version = "1.13", optional = true } tracing = "0.1" [target.'cfg(unix)'.dependencies] -xdg = "2.1" +xdg = "2.5" [target.'cfg(windows)'.dependencies] -known-folders = "1.1.0" +known-folders = "1.2.0" diff --git a/cosmic-theme/Cargo.toml b/cosmic-theme/Cargo.toml index 2034197e..05ab854a 100644 --- a/cosmic-theme/Cargo.toml +++ b/cosmic-theme/Cargo.toml @@ -15,18 +15,18 @@ export = ["serde_json"] no-default = [] [dependencies] -palette = { version = "0.7.3", features = ["serializing"] } +palette = { version = "0.7.6", features = ["serializing"] } almost = "0.2" -serde = { version = "1.0.129", features = ["derive"] } -serde_json = { version = "1.0.64", optional = true, features = [ +serde = { version = "1.0.218", features = ["derive"] } +serde_json = { version = "1.0.139", optional = true, features = [ "preserve_order", ] } -ron = "0.9.0-alpha.0" -lazy_static = "1.4.0" -csscolorparser = { version = "0.6.2", features = ["serde"] } +ron = "0.9.0-alpha.1" +lazy_static = "1.5.0" +csscolorparser = { version = "0.7.0", features = ["serde"] } cosmic-config = { path = "../cosmic-config/", default-features = false, features = [ "subscription", "macro", ] } dirs.workspace = true -thiserror = "1.0.5" +thiserror = "2.0.11" diff --git a/examples/about/Cargo.toml b/examples/about/Cargo.toml index b257999c..cf067095 100644 --- a/examples/about/Cargo.toml +++ b/examples/about/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" [dependencies] -tracing = "0.1.37" -tracing-subscriber = "0.3.17" +tracing = "0.1.41" +tracing-subscriber = "0.3.19" tracing-log = "0.2.0" -open = "5.3.0" +open = "5.3.2" [dependencies.libcosmic] path = "../../" diff --git a/examples/applet/Cargo.toml b/examples/applet/Cargo.toml index 0a9f2b32..fcd0ad13 100644 --- a/examples/applet/Cargo.toml +++ b/examples/applet/Cargo.toml @@ -7,10 +7,10 @@ edition = "2021" [dependencies] once_cell = "1" -rust-embed = "8.0.0" +rust-embed = "8.5.0" tracing = "0.1" -env_logger = "0.10.0" -log = "0.4.17" +env_logger = "0.11.6" +log = "0.4.25" [dependencies.libcosmic] git = "https://github.com/pop-os/libcosmic" diff --git a/examples/application/Cargo.toml b/examples/application/Cargo.toml index 695f9897..66d1923a 100644 --- a/examples/application/Cargo.toml +++ b/examples/application/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" edition = "2021" [dependencies] -tracing = "0.1.37" -tracing-subscriber = "0.3.17" +tracing = "0.1.41" +tracing-subscriber = "0.3.19" tracing-log = "0.2.0" [dependencies.libcosmic] diff --git a/examples/calendar/Cargo.toml b/examples/calendar/Cargo.toml index 8eadab14..02df5ff1 100644 --- a/examples/calendar/Cargo.toml +++ b/examples/calendar/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -chrono = "0.4.35" +chrono = "0.4.39" [dependencies.libcosmic] path = "../../" default-features = false -features = ["debug", "winit", "tokio", "xdg-portal", "wgpu"] \ No newline at end of file +features = ["debug", "winit", "tokio", "xdg-portal", "wgpu"] diff --git a/examples/config/Cargo.toml b/examples/config/Cargo.toml index 40e118ad..480af9a9 100644 --- a/examples/config/Cargo.toml +++ b/examples/config/Cargo.toml @@ -7,4 +7,4 @@ publish = false [dependencies] cosmic-config = { path = "../../cosmic-config" } -ron = "0.9.0-alpha.0" +ron = "0.9.0-alpha.1" diff --git a/examples/context-menu/Cargo.toml b/examples/context-menu/Cargo.toml index 133c642e..5b9ad020 100644 --- a/examples/context-menu/Cargo.toml +++ b/examples/context-menu/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" edition = "2021" [dependencies] -tracing = "0.1.37" -tracing-subscriber = "0.3.17" +tracing = "0.1.41" +tracing-subscriber = "0.3.19" tracing-log = "0.2.0" [dependencies.libcosmic] diff --git a/examples/cosmic/Cargo.toml b/examples/cosmic/Cargo.toml index a7daf0ad..5fe07519 100644 --- a/examples/cosmic/Cargo.toml +++ b/examples/cosmic/Cargo.toml @@ -7,12 +7,12 @@ publish = false [dependencies] apply = "0.3.0" -fraction = "0.14.0" +fraction = "0.15.3" libcosmic = { path = "../..", features = ["debug", "winit", "tokio", "single-instance", "dbus-config", "a11y", "wgpu", "xdg-portal"] } -once_cell = "1.18" -slotmap = "1.0.6" -env_logger = "0.10" -log = "0.4.17" +once_cell = "1.20" +slotmap = "1.0.7" +env_logger = "0.11" +log = "0.4.25" [dependencies.cosmic-time] git = "https://github.com/pop-os/cosmic-time" diff --git a/examples/image-button/Cargo.toml b/examples/image-button/Cargo.toml index cb3ac811..110be619 100644 --- a/examples/image-button/Cargo.toml +++ b/examples/image-button/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" edition = "2021" [dependencies] -tracing = "0.1.37" -tracing-subscriber = "0.3.17" +tracing = "0.1.41" +tracing-subscriber = "0.3.19" [dependencies.libcosmic] path = "../../" diff --git a/examples/menu/Cargo.toml b/examples/menu/Cargo.toml index 4348ca0b..c83a216d 100644 --- a/examples/menu/Cargo.toml +++ b/examples/menu/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" edition = "2021" [dependencies] -tracing = "0.1.37" -tracing-subscriber = "0.3.17" +tracing = "0.1.41" +tracing-subscriber = "0.3.19" tracing-log = "0.2.0" [dependencies.libcosmic] diff --git a/examples/nav-context/Cargo.toml b/examples/nav-context/Cargo.toml index d0f3bce5..a1b95413 100644 --- a/examples/nav-context/Cargo.toml +++ b/examples/nav-context/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" edition = "2021" [dependencies] -tracing = "0.1.37" -tracing-subscriber = "0.3.17" +tracing = "0.1.41" +tracing-subscriber = "0.3.19" tracing-log = "0.2.0" [dependencies.libcosmic] diff --git a/examples/open-dialog/Cargo.toml b/examples/open-dialog/Cargo.toml index a102f533..af97a2ff 100644 --- a/examples/open-dialog/Cargo.toml +++ b/examples/open-dialog/Cargo.toml @@ -10,10 +10,10 @@ xdg-portal = ["libcosmic/xdg-portal"] [dependencies] apply = "0.3.0" -tokio = { version = "1.31", features = ["full"] } -tracing = "0.1.37" -tracing-subscriber = "0.3.17" -url = "2.4.0" +tokio = { version = "1.43", features = ["full"] } +tracing = "0.1.41" +tracing-subscriber = "0.3.19" +url = "2.5.4" [dependencies.libcosmic] features = ["debug", "winit", "multi-window", "wayland", "tokio"] diff --git a/examples/text-input/Cargo.toml b/examples/text-input/Cargo.toml index e84f9eec..1cc35d1d 100644 --- a/examples/text-input/Cargo.toml +++ b/examples/text-input/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" edition = "2021" [dependencies] -tracing = "0.1.37" -tracing-subscriber = "0.3.17" +tracing = "0.1.41" +tracing-subscriber = "0.3.19" tracing-log = "0.2.0" [dependencies.libcosmic]