From 7359e6975e49b8d120dc91359640211f28dbbc31 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 7 Nov 2024 13:55:29 -0500
Subject: [PATCH] Move more dependencies to workspace

There's a lot shared between bootc and ostree-rs-ext.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 Cargo.toml            |  5 +++++
 lib/Cargo.toml        | 10 +++++-----
 ostree-ext/Cargo.toml | 12 ++++++------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9b5afaba6..3eeefb32c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"
@@ -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]
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
index 9dffe0837..a43aaca27 100644
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -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"] }
@@ -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"
diff --git a/ostree-ext/Cargo.toml b/ostree-ext/Cargo.toml
index 5e39ae12f..2d1d400dd 100644
--- a/ostree-ext/Cargo.toml
+++ b/ostree-ext/Cargo.toml
@@ -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"
@@ -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"] }