From bb94543f6120df2f05216503498d657b2a0b442c Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 26 Jun 2026 13:42:59 +0300 Subject: [PATCH] meta: move everything to virtual manifest; version beer-protocols Signed-off-by: NotAShelf Change-Id: I163bfdc04dc7986d8e6406e8cbd3fa1c6a6a6964 --- Cargo.toml | 36 ++++++++++++++++++++++ crates/beer-protocols/Cargo.toml | 6 ++-- crates/beer/Cargo.toml | 52 +++++++++++++------------------- 3 files changed, 60 insertions(+), 34 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f7e08d4..eb94403 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,6 +8,42 @@ edition = "2024" rust-version = "1.95.0" license = "EUPL-1.2" +[workspace.dependencies] +# Workspace components +beer-protocols = { path = "crates/beer-protocols", version = "0.4.0" } + +# Other dependencies +anyhow = "1.0.102" +calloop = { version = "0.14.4", features = ["signals"] } +calloop-wayland-source = "0.4.1" +fontconfig = "0.11.0" +freetype-rs = "0.38.0" +harfbuzz_rs_now = "2.3.2" +lru = "0.18.0" +pound = "0.1.6" +rustix = { version = "1.1.4", features = [ + "pty", + "process", + "termios", + "stdio", + "fs", +] } +serde = { version = "1.0.228", features = ["derive"] } +serde_ignored = "0.1.14" +smithay-client-toolkit = "0.20.0" +thiserror = "2.0.18" +toml = "1.1.2" +tracing = "0.1.44" +tracing-subscriber = { version = "0.3.23", features = ["env-filter"] } +unicode-width = "0.2.2" +vte = "0.15.0" +wayland-client = "0.31.14" +wayland-protocols = { version = "0.32.13", features = [ + "client", + "staging", + "unstable", +] } + [workspace.lints.rust] unsafe_op_in_unsafe_fn = "deny" missing_debug_implementations = "warn" diff --git a/crates/beer-protocols/Cargo.toml b/crates/beer-protocols/Cargo.toml index 39c2da0..64339f7 100644 --- a/crates/beer-protocols/Cargo.toml +++ b/crates/beer-protocols/Cargo.toml @@ -9,9 +9,9 @@ readme = "README.md" [dependencies] # Provides the keyboard vocabulary (Keysym, Modifiers, KeyEvent) the key -# encoder consumes; the version is kept in lockstep with beer so the types -# unify to a single definition across the workspace. -smithay-client-toolkit = "0.20.0" +# encoder consumes. The version comes from [workspace.dependencies] so it is +# always the same as beer's and the types unify to a single definition. +smithay-client-toolkit.workspace = true [lints] workspace = true diff --git a/crates/beer/Cargo.toml b/crates/beer/Cargo.toml index 9624d81..e4c38b7 100644 --- a/crates/beer/Cargo.toml +++ b/crates/beer/Cargo.toml @@ -8,37 +8,27 @@ description = "A fast, software-rendered, Wayland-native terminal emulator" readme = "README.md" [dependencies] -anyhow = "1.0.102" -beer-protocols = { path = "../beer-protocols" } -calloop = { version = "0.14.4", features = ["signals"] } -calloop-wayland-source = "0.4.1" -fontconfig = "0.11.0" -freetype-rs = "0.38.0" -harfbuzz_rs_now = "2.3.2" -lru = "0.18.0" -pound = "0.1.6" -rustix = { version = "1.1.4", features = [ - "pty", - "process", - "termios", - "stdio", - "fs", -] } -serde = { version = "1.0.228", features = ["derive"] } -serde_ignored = "0.1.14" -smithay-client-toolkit = "0.20.0" -thiserror = "2.0.18" -toml = "1.1.2" -tracing = "0.1.44" -tracing-subscriber = { version = "0.3.23", features = ["env-filter"] } -unicode-width = "0.2.2" -vte = "0.15.0" -wayland-client = "0.31.14" -wayland-protocols = { version = "0.32.13", features = [ - "client", - "staging", - "unstable", -] } +anyhow.workspace = true +beer-protocols.workspace = true +calloop.workspace = true +calloop-wayland-source.workspace = true +fontconfig.workspace = true +freetype-rs.workspace = true +harfbuzz_rs_now.workspace = true +lru.workspace = true +pound.workspace = true +rustix.workspace = true +serde.workspace = true +serde_ignored.workspace = true +smithay-client-toolkit.workspace = true +thiserror.workspace = true +toml.workspace = true +tracing.workspace = true +tracing-subscriber.workspace = true +unicode-width.workspace = true +vte.workspace = true +wayland-client.workspace = true +wayland-protocols.workspace = true [lints] workspace = true