Skip to content

Commit 7359e69

Browse files
committed
Move more dependencies to workspace
There's a lot shared between bootc and ostree-rs-ext. Signed-off-by: Colin Walters <[email protected]>
1 parent 23a54d9 commit 7359e69

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@ camino = "1.1.6"
2323
cap-std-ext = "4.0.2"
2424
chrono = { version = "0.4.38", default-features = false }
2525
clap = "4.5.4"
26+
clap_mangen = { version = "0.2.20" }
27+
hex = "0.4.3"
2628
indoc = "2.0.5"
29+
indicatif = "0.17.0"
2730
fn-error-context = "0.2.1"
2831
libc = "0.2.154"
32+
openssl = "0.10.33"
2933
rustix = { "version" = "0.38.34", features = ["thread", "fs", "system", "process", "mount"] }
3034
serde = "1.0.199"
3135
serde_json = "1.0.116"
@@ -34,6 +38,7 @@ static_assertions = "1.1.0"
3438
tempfile = "3.10.1"
3539
tracing = "0.1.40"
3640
tokio = ">= 1.37.0"
41+
tokio-util = { features = ["io-util"], version = "0.7.10" }
3742

3843
# See https://github.com/coreos/cargo-vendor-filterer
3944
[workspace.metadata.vendor-filter]

lib/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ camino = { workspace = true, features = ["serde1"] }
2222
ostree-ext = { path = "../ostree-ext" }
2323
chrono = { workspace = true, features = ["serde"] }
2424
clap = { workspace = true, features = ["derive","cargo"] }
25-
clap_mangen = { version = "0.2.20", optional = true }
25+
clap_mangen = { workspace = true, optional = true }
2626
cap-std-ext = { workspace = true, features = ["fs_utf8"] }
27-
hex = "^0.4.3"
27+
hex = { workspace = true }
2828
fn-error-context = { workspace = true }
29-
indicatif = "0.17.8"
29+
indicatif = { workspace = true }
3030
libc = { workspace = true }
3131
liboverdrop = "0.1.0"
3232
libsystemd = "0.7"
33-
openssl = "^0.10.64"
33+
openssl = { workspace = true }
3434
regex = "1.10.4"
3535
rustix = { workspace = true }
3636
schemars = { version = "0.8.17", features = ["chrono"] }
@@ -39,7 +39,7 @@ serde_ignored = "0.1.10"
3939
serde_json = { workspace = true }
4040
serde_yaml = "0.9.34"
4141
tokio = { workspace = true, features = ["io-std", "time", "process", "rt", "net"] }
42-
tokio-util = { features = ["io-util"], version = "0.7.10" }
42+
tokio-util = { workspace = true }
4343
tracing = { workspace = true }
4444
tempfile = { workspace = true }
4545
toml = "0.8.12"

ostree-ext/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ ostree = { features = ["v2022_6"], version = "0.19.0" }
2020
# Private dependencies
2121
anyhow = { workspace = true }
2222
camino = { workspace = true, features = ["serde1"] }
23-
chrono = "0.4.19"
23+
chrono = { workspace = true }
2424
olpc-cjson = "0.1.1"
2525
clap = { workspace = true, features = ["derive","cargo"] }
26-
clap_mangen = { version = "0.2.20", optional = true }
26+
clap_mangen = { workspace = true, optional = true }
2727
cap-std-ext = { workspace = true, features = ["fs_utf8"] }
2828
flate2 = { features = ["zlib"], default-features = false, version = "1.0.20" }
2929
fn-error-context = { workspace = true }
3030
futures-util = "0.3.13"
3131
gvariant = "0.5.0"
32-
hex = "0.4.3"
32+
hex = { workspace = true }
3333
io-lifetimes = "2"
34-
indicatif = "0.17.0"
34+
indicatif = { workspace = true }
3535
once_cell = "1.9"
3636
libc = { workspace = true }
3737
libsystemd = "0.7.0"
38-
openssl = "0.10.33"
38+
openssl = { workspace = true }
3939
ocidir = "0.3.0"
4040
pin-project = "1.0"
4141
regex = "1.5.4"
@@ -46,7 +46,7 @@ tar = "0.4.43"
4646
tempfile = { workspace = true }
4747
terminal_size = "0.3"
4848
tokio = { workspace = true, features = ["io-std", "time", "process", "rt", "net"] }
49-
tokio-util = { version = "0.7.10", features = ["io-util"] }
49+
tokio-util = { workspace = true }
5050
tokio-stream = { features = ["sync"], version = "0.1.8" }
5151
tracing = "0.1"
5252
zstd = { version = "0.13.1", features = ["pkg-config"] }

0 commit comments

Comments
 (0)