diff --git a/Cargo.lock b/Cargo.lock index ecf97a9..016cd10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -658,7 +658,7 @@ dependencies = [ "grass", "gtk", "gtk-layer-shell", - "itertools 0.11.0", + "itertools 0.12.1", "libc", "log", "maplit", @@ -1295,9 +1295,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -2069,7 +2069,7 @@ dependencies = [ "chrono-tz", "eww_shared_util", "insta", - "itertools 0.10.5", + "itertools 0.12.1", "jaq-core", "jaq-std", "lalrpop", @@ -2748,7 +2748,7 @@ dependencies = [ "derive_more", "eww_shared_util", "insta", - "itertools 0.10.5", + "itertools 0.12.1", "lalrpop", "lalrpop-util", "maplit", diff --git a/Cargo.toml b/Cargo.toml index 9098919..545e59e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,53 @@ members = ["crates/*"] resolver = "2" +[workspace.dependencies] + +simplexpr = { version = "0.1.0", path = "crates/simplexpr" } +eww_shared_util = { version = "0.1.0", path = "crates/eww_shared_util" } +yuck = { version = "0.1.0", path = "crates/yuck", default-features = false} + +anyhow = "1.0.79" +bincode = "1.3.3" +cached = "0.42.0" +chrono = "0.4.26" +chrono-tz = "0.8.2" +clap = {version = "4.3.21", features = ["derive"] } +codespan-reporting = "0.11" +derive_more = "0.99" +extend = "1.2" +futures = "0.3.28" +grass = {version = "0.13.1", default-features = false} +insta = "1.7" +itertools = "0.12.1" +jaq-core = "0.9.0" +jaq-std = {version = "0.9.0", features = ["bincode"]} +lalrpop = "0.19.5" +lalrpop-util = "0.19.5" +libc = "0.2" +log = "0.4" +maplit = "1" +nix = "0.26.2" +notify = "6.0.1" +once_cell = "1.18" +pretty_assertions = "1.2" +pretty_env_logger = "0.5" +ref-cast = "1.0.22" +regex = "1.10.3" +serde_json = "1.0" +serde = {version = "1.0", features = ["derive"]} +simple-signal = "1.1" +smart-default = "0.6" +static_assertions = "1.1" +strsim = "0.10" +strum = { version = "0.24", features = ["derive"] } +sysinfo = "0.29.8" +thiserror = "1.0" +tokio-util = "0.7.8" +tokio = { version = "1.31.0", features = ["full"] } +unescape = "0.1" +wait-timeout = "0.2" + [profile.dev] split-debuginfo = "unpacked" diff --git a/crates/eww/Cargo.toml b/crates/eww/Cargo.toml index fe40aec..d30541a 100644 --- a/crates/eww/Cargo.toml +++ b/crates/eww/Cargo.toml @@ -16,6 +16,10 @@ x11 = ["gdkx11", "x11rb"] wayland = ["gtk-layer-shell"] [dependencies] +simplexpr.workspace = true +eww_shared_util.workspace = true +yuck.workspace = true + gtk = "0.17.1" gdk = "0.17.1" glib = "0.17.8" @@ -30,38 +34,29 @@ gtk-layer-shell = { version = "0.6.1", optional = true } gdkx11 = { version = "0.17", optional = true } x11rb = { version = "0.11.1", features = ["randr"], optional = true } -regex = "1.9.3" -bincode = "1.3.3" -anyhow = "1.0.70" -derive_more = "0.99" -maplit = "1" -clap = {version = "4.3.21", features = ["derive"] } -serde = {version = "1.0", features = ["derive"]} -serde_json = "1.0" -extend = "1.2" -grass = {version = "0.13.1", default-features = false} -itertools = "0.11" -log = "0.4" -pretty_env_logger = "0.5" -libc = "0.2" -once_cell = "1.18" -nix = "0.26.2" -simple-signal = "1.1" -unescape = "0.1" - -tokio = { version = "1.31.0", features = ["full"] } -futures = "0.3.28" -tokio-util = "0.7.8" - -sysinfo = "0.29.8" -chrono = "0.4.26" - -wait-timeout = "0.2" - -notify = "6.0.1" - -codespan-reporting = "0.11" - -simplexpr = { version = "0.1.0", path = "../simplexpr" } -eww_shared_util = { version = "0.1.0", path = "../eww_shared_util" } -yuck = { version = "0.1.0", path = "../yuck", default-features = false} +anyhow.workspace = true +bincode.workspace = true +chrono.workspace = true +clap = {workspace = true, features = ["derive"] } +codespan-reporting.workspace = true +derive_more.workspace = true +extend.workspace = true +futures.workspace = true +grass = {workspace = true, default-features = false} +itertools.workspace = true +libc.workspace = true +log.workspace = true +maplit.workspace = true +nix.workspace = true +notify.workspace = true +once_cell.workspace = true +pretty_env_logger.workspace = true +regex.workspace = true +serde_json.workspace = true +serde = {workspace = true, features = ["derive"]} +simple-signal.workspace = true +sysinfo.workspace = true +tokio-util.workspace = true +tokio = { workspace = true, features = ["full"] } +unescape.workspace = true +wait-timeout.workspace = true diff --git a/crates/eww_shared_util/Cargo.toml b/crates/eww_shared_util/Cargo.toml index 35b9e08..24a9108 100644 --- a/crates/eww_shared_util/Cargo.toml +++ b/crates/eww_shared_util/Cargo.toml @@ -9,6 +9,6 @@ repository = "https://github.com/elkowar/eww" homepage = "https://github.com/elkowar/eww" [dependencies] -serde = {version = "1.0", features = ["derive"]} -derive_more = "0.99" -ref-cast = "1.0.6" +serde.workspace = true +derive_more.workspace = true +ref-cast.workspace = true diff --git a/crates/simplexpr/Cargo.toml b/crates/simplexpr/Cargo.toml index 5b8ea39..a30061c 100644 --- a/crates/simplexpr/Cargo.toml +++ b/crates/simplexpr/Cargo.toml @@ -12,29 +12,27 @@ homepage = "https://github.com/elkowar/eww" build = "build.rs" [dependencies] -lalrpop-util = "0.19.5" -regex = "1.5.5" -itertools = "0.10" -thiserror = "1.0" +eww_shared_util.workspace = true -once_cell = "1.8.0" -serde = {version = "1.0", features = ["derive"]} -serde_json = "1.0" -strsim = "0.10" -jaq-core = "0.9.0" -jaq-std = {version = "0.9.0", features = ["bincode"]} -static_assertions = "1.1.0" -cached = "0.42.0" -chrono = "0.4.26" -chrono-tz = "0.8.2" - -strum = { version = "0.24", features = ["derive"] } - -eww_shared_util = { version = "0.1.0", path = "../eww_shared_util" } +cached.workspace = true +chrono-tz.workspace = true +chrono.workspace = true +itertools.workspace = true +jaq-core.workspace = true +jaq-std = {workspace = true, features = ["bincode"]} +lalrpop-util.workspace = true +once_cell.workspace = true +regex.workspace = true +serde_json.workspace = true +serde = {workspace = true, features = ["derive"]} +static_assertions.workspace = true +strsim.workspace = true +strum = { workspace = true, features = ["derive"] } +thiserror.workspace = true [build-dependencies] -lalrpop = "0.19.5" +lalrpop.workspace = true [dev-dependencies] -insta = "1.7" +insta.workspace = true diff --git a/crates/yuck/Cargo.toml b/crates/yuck/Cargo.toml index 9e21c17..d1de6e8 100644 --- a/crates/yuck/Cargo.toml +++ b/crates/yuck/Cargo.toml @@ -11,29 +11,27 @@ homepage = "https://github.com/elkowar/eww" build = "build.rs" [dependencies] -lalrpop-util = "0.19.5" -regex = "1.5.5" -itertools = "0.10" -thiserror = "1.0" -maplit = "1.0" -codespan-reporting = "0.11" +simplexpr.workspace = true +eww_shared_util.workspace = true -derive_more = "0.99" -smart-default = "0.6" -serde = {version = "1.0", features = ["derive"]} -once_cell = "1.8" - -strum = { version = "0.24", features = ["derive"] } -anyhow = "1" -static_assertions = "1.1" - -simplexpr = { version = "0.1.0", path = "../simplexpr" } -eww_shared_util = { version = "0.1.0", path = "../eww_shared_util" } +anyhow.workspace = true +codespan-reporting.workspace = true +derive_more.workspace = true +itertools.workspace = true +lalrpop-util.workspace = true +maplit.workspace = true +once_cell.workspace = true +regex.workspace = true +serde = {workspace = true, features = ["derive"]} +smart-default.workspace = true +static_assertions.workspace = true +strum = { workspace = true, features = ["derive"] } +thiserror.workspace = true [build-dependencies] -lalrpop = "0.19.5" +lalrpop.workspace = true [dev-dependencies] -insta = "1.7" -pretty_assertions = "1.2" +insta.workspace = true +pretty_assertions.workspace = true