Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
94d9a08093 |
17 changed files with 84 additions and 80 deletions
42
Cargo.toml
42
Cargo.toml
|
|
@ -87,41 +87,43 @@ markdown = ["iced/markdown"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
apply = "0.3.0"
|
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 }
|
async-fs = { version = "2.1", optional = true }
|
||||||
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "178eb0b", 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-config = { path = "cosmic-config" }
|
||||||
cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
|
cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
|
||||||
css-color = "0.2.5"
|
css-color = "0.2.8"
|
||||||
derive_setters = "0.1.5"
|
derive_setters = "0.1.6"
|
||||||
image = { version = "0.25.5", default-features = false, features = [
|
image = { version = "0.25.5", default-features = false, features = [
|
||||||
"jpeg",
|
"jpeg",
|
||||||
"png",
|
"png",
|
||||||
] }
|
] }
|
||||||
lazy_static = "1.4.0"
|
lazy_static = "1.5.0"
|
||||||
libc = { version = "0.2.155", optional = true }
|
libc = { version = "0.2.169", optional = true }
|
||||||
license = { version = "3.5.1", optional = true }
|
license = { version = "3.6.0", optional = true }
|
||||||
mime = { version = "0.3.17", optional = true }
|
mime = { version = "0.3.17", optional = true }
|
||||||
palette = "0.7.3"
|
palette = "0.7.6"
|
||||||
rfd = { version = "0.14.0", default-features = false, features = ["xdg-portal"], optional = true }
|
rfd = { version = "0.15.2", default-features = false, features = [
|
||||||
rustix = { version = "0.38.34", features = [
|
"xdg-portal",
|
||||||
|
], optional = true }
|
||||||
|
rustix = { version = "0.38.44", features = [
|
||||||
"pipe",
|
"pipe",
|
||||||
"process",
|
"process",
|
||||||
], optional = true }
|
], optional = true }
|
||||||
serde = { version = "1.0.180", features = ["derive"] }
|
serde = { version = "1.0.218", features = ["derive"] }
|
||||||
slotmap = "1.0.6"
|
slotmap = "1.0.7"
|
||||||
smol = { version = "2.0.0", optional = true }
|
smol = { version = "2.0.2", optional = true }
|
||||||
thiserror = "1.0.44"
|
thiserror = "2.0.11"
|
||||||
tokio = { version = "1.24.2", optional = true }
|
tokio = { version = "1.43.0", optional = true }
|
||||||
tracing = "0.1.41"
|
tracing = "0.1.41"
|
||||||
unicode-segmentation = "1.6"
|
unicode-segmentation = "1.12"
|
||||||
url = "2.4.0"
|
url = "2.5.4"
|
||||||
zbus = { version = "4.2.1", default-features = false, optional = true }
|
zbus = { version = "4.0", default-features = false, optional = true }
|
||||||
|
|
||||||
[target.'cfg(unix)'.dependencies]
|
[target.'cfg(unix)'.dependencies]
|
||||||
freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" }
|
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 }
|
shlex = { version = "1.3.0", optional = true }
|
||||||
|
|
||||||
[dependencies.cosmic-theme]
|
[dependencies.cosmic-theme]
|
||||||
|
|
@ -194,7 +196,7 @@ members = [
|
||||||
exclude = ["iced"]
|
exclude = ["iced"]
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
dirs = "5.0.1"
|
dirs = "6.0.0"
|
||||||
|
|
||||||
|
|
||||||
[patch."https://github.com/pop-os/libcosmic"]
|
[patch."https://github.com/pop-os/libcosmic"]
|
||||||
|
|
|
||||||
|
|
@ -8,5 +8,5 @@ edition = "2021"
|
||||||
proc-macro = true
|
proc-macro = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
syn = "1.0"
|
syn = "2.0"
|
||||||
quote = "1.0"
|
quote = "1.0"
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use proc_macro::TokenStream;
|
use proc_macro::TokenStream;
|
||||||
use quote::quote;
|
use quote::quote;
|
||||||
use syn::{self};
|
use syn::{self, LitInt};
|
||||||
|
|
||||||
#[proc_macro_derive(CosmicConfigEntry, attributes(version, id))]
|
#[proc_macro_derive(CosmicConfigEntry, attributes(version, id))]
|
||||||
pub fn cosmic_config_entry_derive(input: TokenStream) -> TokenStream {
|
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
|
let version = attributes
|
||||||
.iter()
|
.iter()
|
||||||
.find_map(|attr| {
|
.find_map(|attr| {
|
||||||
if attr.path.is_ident("version") {
|
let mut version_found = None;
|
||||||
match attr.parse_meta() {
|
|
||||||
Ok(syn::Meta::NameValue(syn::MetaNameValue {
|
_ = attr.parse_nested_meta(|meta| {
|
||||||
lit: syn::Lit::Int(lit_int),
|
if meta.path.is_ident("version") {
|
||||||
..
|
if let Ok(lit_int) = meta.input.parse::<LitInt>() {
|
||||||
})) => Some(lit_int.base10_parse::<u64>().unwrap()),
|
version_found = Some(lit_int.base10_parse::<u64>().unwrap());
|
||||||
_ => None,
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
});
|
||||||
|
|
||||||
|
version_found
|
||||||
})
|
})
|
||||||
.unwrap_or(0);
|
.unwrap_or(0);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,24 +11,24 @@ subscription = ["iced_futures"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cosmic-settings-daemon = { git = "https://github.com/pop-os/dbus-settings-bindings", optional = true }
|
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" }
|
atomicwrites = { git = "https://github.com/jackpot51/rust-atomicwrites" }
|
||||||
calloop = { version = "0.14.0", optional = true }
|
calloop = { version = "0.14.2", optional = true }
|
||||||
notify = "6.0.0"
|
notify = "8.0.0"
|
||||||
ron = "0.9.0-alpha.0"
|
ron = "0.9.0-alpha.1"
|
||||||
serde = "1.0.152"
|
serde = "1.0.218"
|
||||||
cosmic-config-derive = { path = "../cosmic-config-derive/", optional = true }
|
cosmic-config-derive = { path = "../cosmic-config-derive/", optional = true }
|
||||||
iced = { path = "../iced/", default-features = false, optional = true }
|
iced = { path = "../iced/", default-features = false, optional = true }
|
||||||
iced_futures = { path = "../iced/futures/", 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 }
|
futures-util = { version = "0.3", optional = true }
|
||||||
dirs.workspace = true
|
dirs.workspace = true
|
||||||
tokio = { version = "1.0", optional = true, features = ["time"] }
|
tokio = { version = "1.43", optional = true, features = ["time"] }
|
||||||
async-std = { version = "1.10", optional = true }
|
async-std = { version = "1.13", optional = true }
|
||||||
tracing = "0.1"
|
tracing = "0.1"
|
||||||
|
|
||||||
[target.'cfg(unix)'.dependencies]
|
[target.'cfg(unix)'.dependencies]
|
||||||
xdg = "2.1"
|
xdg = "2.5"
|
||||||
|
|
||||||
[target.'cfg(windows)'.dependencies]
|
[target.'cfg(windows)'.dependencies]
|
||||||
known-folders = "1.1.0"
|
known-folders = "1.2.0"
|
||||||
|
|
|
||||||
|
|
@ -15,18 +15,18 @@ export = ["serde_json"]
|
||||||
no-default = []
|
no-default = []
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
palette = { version = "0.7.3", features = ["serializing"] }
|
palette = { version = "0.7.6", features = ["serializing"] }
|
||||||
almost = "0.2"
|
almost = "0.2"
|
||||||
serde = { version = "1.0.129", features = ["derive"] }
|
serde = { version = "1.0.218", features = ["derive"] }
|
||||||
serde_json = { version = "1.0.64", optional = true, features = [
|
serde_json = { version = "1.0.139", optional = true, features = [
|
||||||
"preserve_order",
|
"preserve_order",
|
||||||
] }
|
] }
|
||||||
ron = "0.9.0-alpha.0"
|
ron = "0.9.0-alpha.1"
|
||||||
lazy_static = "1.4.0"
|
lazy_static = "1.5.0"
|
||||||
csscolorparser = { version = "0.6.2", features = ["serde"] }
|
csscolorparser = { version = "0.7.0", features = ["serde"] }
|
||||||
cosmic-config = { path = "../cosmic-config/", default-features = false, features = [
|
cosmic-config = { path = "../cosmic-config/", default-features = false, features = [
|
||||||
"subscription",
|
"subscription",
|
||||||
"macro",
|
"macro",
|
||||||
] }
|
] }
|
||||||
dirs.workspace = true
|
dirs.workspace = true
|
||||||
thiserror = "1.0.5"
|
thiserror = "2.0.11"
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@ version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tracing = "0.1.37"
|
tracing = "0.1.41"
|
||||||
tracing-subscriber = "0.3.17"
|
tracing-subscriber = "0.3.19"
|
||||||
tracing-log = "0.2.0"
|
tracing-log = "0.2.0"
|
||||||
open = "5.3.0"
|
open = "5.3.2"
|
||||||
|
|
||||||
[dependencies.libcosmic]
|
[dependencies.libcosmic]
|
||||||
path = "../../"
|
path = "../../"
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,10 @@ edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
once_cell = "1"
|
once_cell = "1"
|
||||||
rust-embed = "8.0.0"
|
rust-embed = "8.5.0"
|
||||||
tracing = "0.1"
|
tracing = "0.1"
|
||||||
env_logger = "0.10.0"
|
env_logger = "0.11.6"
|
||||||
log = "0.4.17"
|
log = "0.4.25"
|
||||||
|
|
||||||
[dependencies.libcosmic]
|
[dependencies.libcosmic]
|
||||||
git = "https://github.com/pop-os/libcosmic"
|
git = "https://github.com/pop-os/libcosmic"
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@ version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tracing = "0.1.37"
|
tracing = "0.1.41"
|
||||||
tracing-subscriber = "0.3.17"
|
tracing-subscriber = "0.3.19"
|
||||||
tracing-log = "0.2.0"
|
tracing-log = "0.2.0"
|
||||||
|
|
||||||
[dependencies.libcosmic]
|
[dependencies.libcosmic]
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ edition = "2021"
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
chrono = "0.4.35"
|
chrono = "0.4.39"
|
||||||
|
|
||||||
[dependencies.libcosmic]
|
[dependencies.libcosmic]
|
||||||
path = "../../"
|
path = "../../"
|
||||||
|
|
|
||||||
|
|
@ -7,4 +7,4 @@ publish = false
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cosmic-config = { path = "../../cosmic-config" }
|
cosmic-config = { path = "../../cosmic-config" }
|
||||||
ron = "0.9.0-alpha.0"
|
ron = "0.9.0-alpha.1"
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@ version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tracing = "0.1.37"
|
tracing = "0.1.41"
|
||||||
tracing-subscriber = "0.3.17"
|
tracing-subscriber = "0.3.19"
|
||||||
tracing-log = "0.2.0"
|
tracing-log = "0.2.0"
|
||||||
|
|
||||||
[dependencies.libcosmic]
|
[dependencies.libcosmic]
|
||||||
|
|
|
||||||
|
|
@ -7,12 +7,12 @@ publish = false
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
apply = "0.3.0"
|
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"] }
|
libcosmic = { path = "../..", features = ["debug", "winit", "tokio", "single-instance", "dbus-config", "a11y", "wgpu", "xdg-portal"] }
|
||||||
once_cell = "1.18"
|
once_cell = "1.20"
|
||||||
slotmap = "1.0.6"
|
slotmap = "1.0.7"
|
||||||
env_logger = "0.10"
|
env_logger = "0.11"
|
||||||
log = "0.4.17"
|
log = "0.4.25"
|
||||||
|
|
||||||
[dependencies.cosmic-time]
|
[dependencies.cosmic-time]
|
||||||
git = "https://github.com/pop-os/cosmic-time"
|
git = "https://github.com/pop-os/cosmic-time"
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@ version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tracing = "0.1.37"
|
tracing = "0.1.41"
|
||||||
tracing-subscriber = "0.3.17"
|
tracing-subscriber = "0.3.19"
|
||||||
|
|
||||||
[dependencies.libcosmic]
|
[dependencies.libcosmic]
|
||||||
path = "../../"
|
path = "../../"
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@ version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tracing = "0.1.37"
|
tracing = "0.1.41"
|
||||||
tracing-subscriber = "0.3.17"
|
tracing-subscriber = "0.3.19"
|
||||||
tracing-log = "0.2.0"
|
tracing-log = "0.2.0"
|
||||||
|
|
||||||
[dependencies.libcosmic]
|
[dependencies.libcosmic]
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@ version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tracing = "0.1.37"
|
tracing = "0.1.41"
|
||||||
tracing-subscriber = "0.3.17"
|
tracing-subscriber = "0.3.19"
|
||||||
tracing-log = "0.2.0"
|
tracing-log = "0.2.0"
|
||||||
|
|
||||||
[dependencies.libcosmic]
|
[dependencies.libcosmic]
|
||||||
|
|
|
||||||
|
|
@ -10,10 +10,10 @@ xdg-portal = ["libcosmic/xdg-portal"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
apply = "0.3.0"
|
apply = "0.3.0"
|
||||||
tokio = { version = "1.31", features = ["full"] }
|
tokio = { version = "1.43", features = ["full"] }
|
||||||
tracing = "0.1.37"
|
tracing = "0.1.41"
|
||||||
tracing-subscriber = "0.3.17"
|
tracing-subscriber = "0.3.19"
|
||||||
url = "2.4.0"
|
url = "2.5.4"
|
||||||
|
|
||||||
[dependencies.libcosmic]
|
[dependencies.libcosmic]
|
||||||
features = ["debug", "winit", "multi-window", "wayland", "tokio"]
|
features = ["debug", "winit", "multi-window", "wayland", "tokio"]
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@ version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tracing = "0.1.37"
|
tracing = "0.1.41"
|
||||||
tracing-subscriber = "0.3.17"
|
tracing-subscriber = "0.3.19"
|
||||||
tracing-log = "0.2.0"
|
tracing-log = "0.2.0"
|
||||||
|
|
||||||
[dependencies.libcosmic]
|
[dependencies.libcosmic]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue