Skip to content

Commit

Permalink
Move more dependencies to workspace
Browse files Browse the repository at this point in the history
There's a lot shared between bootc and ostree-rs-ext.

Signed-off-by: Colin Walters <[email protected]>
  • Loading branch information
cgwalters committed Nov 7, 2024
1 parent 23a54d9 commit 7359e69
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
5 changes: 5 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,13 @@ camino = "1.1.6"
cap-std-ext = "4.0.2"
chrono = { version = "0.4.38", default-features = false }
clap = "4.5.4"
clap_mangen = { version = "0.2.20" }
hex = "0.4.3"
indoc = "2.0.5"
indicatif = "0.17.0"
fn-error-context = "0.2.1"
libc = "0.2.154"
openssl = "0.10.33"
rustix = { "version" = "0.38.34", features = ["thread", "fs", "system", "process", "mount"] }
serde = "1.0.199"
serde_json = "1.0.116"
Expand All @@ -34,6 +38,7 @@ static_assertions = "1.1.0"
tempfile = "3.10.1"
tracing = "0.1.40"
tokio = ">= 1.37.0"
tokio-util = { features = ["io-util"], version = "0.7.10" }

# See https://github.com/coreos/cargo-vendor-filterer
[workspace.metadata.vendor-filter]
Expand Down
10 changes: 5 additions & 5 deletions lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ camino = { workspace = true, features = ["serde1"] }
ostree-ext = { path = "../ostree-ext" }
chrono = { workspace = true, features = ["serde"] }
clap = { workspace = true, features = ["derive","cargo"] }
clap_mangen = { version = "0.2.20", optional = true }
clap_mangen = { workspace = true, optional = true }
cap-std-ext = { workspace = true, features = ["fs_utf8"] }
hex = "^0.4.3"
hex = { workspace = true }
fn-error-context = { workspace = true }
indicatif = "0.17.8"
indicatif = { workspace = true }
libc = { workspace = true }
liboverdrop = "0.1.0"
libsystemd = "0.7"
openssl = "^0.10.64"
openssl = { workspace = true }
regex = "1.10.4"
rustix = { workspace = true }
schemars = { version = "0.8.17", features = ["chrono"] }
Expand All @@ -39,7 +39,7 @@ serde_ignored = "0.1.10"
serde_json = { workspace = true }
serde_yaml = "0.9.34"
tokio = { workspace = true, features = ["io-std", "time", "process", "rt", "net"] }
tokio-util = { features = ["io-util"], version = "0.7.10" }
tokio-util = { workspace = true }
tracing = { workspace = true }
tempfile = { workspace = true }
toml = "0.8.12"
Expand Down
12 changes: 6 additions & 6 deletions ostree-ext/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@ ostree = { features = ["v2022_6"], version = "0.19.0" }
# Private dependencies
anyhow = { workspace = true }
camino = { workspace = true, features = ["serde1"] }
chrono = "0.4.19"
chrono = { workspace = true }
olpc-cjson = "0.1.1"
clap = { workspace = true, features = ["derive","cargo"] }
clap_mangen = { version = "0.2.20", optional = true }
clap_mangen = { workspace = true, optional = true }
cap-std-ext = { workspace = true, features = ["fs_utf8"] }
flate2 = { features = ["zlib"], default-features = false, version = "1.0.20" }
fn-error-context = { workspace = true }
futures-util = "0.3.13"
gvariant = "0.5.0"
hex = "0.4.3"
hex = { workspace = true }
io-lifetimes = "2"
indicatif = "0.17.0"
indicatif = { workspace = true }
once_cell = "1.9"
libc = { workspace = true }
libsystemd = "0.7.0"
openssl = "0.10.33"
openssl = { workspace = true }
ocidir = "0.3.0"
pin-project = "1.0"
regex = "1.5.4"
Expand All @@ -46,7 +46,7 @@ tar = "0.4.43"
tempfile = { workspace = true }
terminal_size = "0.3"
tokio = { workspace = true, features = ["io-std", "time", "process", "rt", "net"] }
tokio-util = { version = "0.7.10", features = ["io-util"] }
tokio-util = { workspace = true }
tokio-stream = { features = ["sync"], version = "0.1.8" }
tracing = "0.1"
zstd = { version = "0.13.1", features = ["pkg-config"] }
Expand Down

0 comments on commit 7359e69

Please sign in to comment.