aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToby Vincent <tobyv13@gmail.com>2022-10-21 00:38:46 -0500
committerToby Vincent <tobyv13@gmail.com>2022-10-21 00:38:46 -0500
commit7b5ba17a0dcc4ea36e1f332321f63a38010f9f82 (patch)
treec6976d797005e6994240ea1475c290759eb6827a
parent607d964d2778f2fc06902296bde539fd79ba059b (diff)
chore: update package's to use workspace dependencies
-rw-r--r--Cargo.toml17
-rw-r--r--zone/Cargo.toml26
-rw-r--r--zone_core/Cargo.toml24
-rw-r--r--zone_nspawn/Cargo.toml28
-rw-r--r--zone_overlay/Cargo.toml26
-rw-r--r--zone_zfs/Cargo.toml30
-rw-r--r--zoned/Cargo.toml42
7 files changed, 103 insertions, 90 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 953de80..a9b2e62 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,13 +3,12 @@ members = [
"zone",
"zone_core",
"zone_nspawn",
- "zone_zfs",
"zone_overlay",
+ "zone_zfs",
"zoned",
]
default-members = ["zone", "zoned"]
-
[workspace.package]
version = "0.1.0"
authors = [
@@ -23,3 +22,17 @@ repository = "https://git.sr.ht/~tobyvin/zone"
license = "MIT"
keywords = ["zone", "zoned", "container", "containers", "websocket"]
categories = ["HTTP server", "WebSocket"]
+
+[workspace.dependencies]
+zone_core = { path = "zone_core" }
+zone_nspawn = { path = "zone_nspawn" }
+zone_zfs = { path = "zone_zfs" }
+zone_overlay = { path = "zone_overlay" }
+anyhow = "1.0.65"
+serde = "1.0.145"
+serde_json = "1.0.85"
+thiserror = "1.0.36"
+tokio = "1.21.1"
+tracing = "0.1.36"
+tracing-subscriber = "0.3.15"
+figment = { version = "0.10.7", features = ["toml", "env", "test"] }
diff --git a/zone/Cargo.toml b/zone/Cargo.toml
index 05331fa..3b3bff6 100644
--- a/zone/Cargo.toml
+++ b/zone/Cargo.toml
@@ -1,28 +1,28 @@
[package]
name = "zone"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-description.workspace = true
-homepage.workspace = true
-repository.workspace = true
-license.workspace = true
-keywords.workspace = true
-categories.workspace = true
+version = { workspace = true }
+authors = { workspace = true }
+edition = { workspace = true }
+description = { workspace = true }
+homepage = { workspace = true }
+repository = { workspace = true }
+license = { workspace = true }
+keywords = { workspace = true }
+categories = { workspace = true }
workspace = ".."
[dependencies]
-anyhow = "1.0.65"
+anyhow = { workspace = true }
clap = { version = "3.2.22", features = ["derive", "env"] }
clap_complete = "3.2.5"
futures = "0.3.24"
futures-channel = "0.3.24"
log = "0.4.17"
reqwest = { version = "0.11.12", features = ["blocking", "json"] }
-serde_json = "1.0.85"
+serde_json = { workspace = true }
simplelog = "0.12.0"
tabled = "0.8.0"
-tokio = "1.21.1"
+tokio = { workspace = true }
tokio-stream = "0.1.10"
tokio-tungstenite = "0.17.2"
-zone_core = { path = "../zone_core" }
+zone_core = { workspace = true }
diff --git a/zone_core/Cargo.toml b/zone_core/Cargo.toml
index 5255f3a..7f864a9 100644
--- a/zone_core/Cargo.toml
+++ b/zone_core/Cargo.toml
@@ -1,14 +1,14 @@
[package]
name = "zone_core"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-description.workspace = true
-homepage.workspace = true
-repository.workspace = true
-license.workspace = true
-keywords.workspace = true
-categories.workspace = true
+version = { workspace = true }
+authors = { workspace = true }
+edition = { workspace = true }
+description = { workspace = true }
+homepage = { workspace = true }
+repository = { workspace = true }
+license = { workspace = true }
+keywords = { workspace = true }
+categories = { workspace = true }
workspace = ".."
[dependencies]
@@ -18,10 +18,10 @@ clap = { version = "3.2.22", default-features = false, features = [
"derive",
] }
derive_builder = "0.11.2"
-serde = "1.0.145"
+serde = { workspace = true }
strum = "0.24.1"
strum_macros = "0.24.3"
tabled = "0.8.0"
-thiserror = "1.0.36"
-tokio = "1.21.1"
+thiserror = { workspace = true }
+tokio = { workspace = true }
wspty = "0.1.1"
diff --git a/zone_nspawn/Cargo.toml b/zone_nspawn/Cargo.toml
index 678f141..cb322bc 100644
--- a/zone_nspawn/Cargo.toml
+++ b/zone_nspawn/Cargo.toml
@@ -1,22 +1,22 @@
[package]
name = "zone_nspawn"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-description.workspace = true
-homepage.workspace = true
-repository.workspace = true
-license.workspace = true
-keywords.workspace = true
-categories.workspace = true
+version = { workspace = true }
+authors = { workspace = true }
+edition = { workspace = true }
+description = { workspace = true }
+homepage = { workspace = true }
+repository = { workspace = true }
+license = { workspace = true }
+keywords = { workspace = true }
+categories = { workspace = true }
workspace = ".."
[dependencies]
async-trait = "0.1.57"
-serde = "1.0.145"
+serde = { workspace = true }
serde_ini = "0.2.0"
-serde_json = "1.0.85"
-thiserror = "1.0.36"
-tokio = { version = "1.21.1", default-features = false, features = ["process"] }
+serde_json = { workspace = true }
+thiserror = { workspace = true }
+tokio = { workspace = true, default-features = false, features = ["process"] }
wspty = "0.1.1"
-zone_core = { path = "../zone_core" }
+zone_core = { workspace = true }
diff --git a/zone_overlay/Cargo.toml b/zone_overlay/Cargo.toml
index b0ab535..7cf18f3 100644
--- a/zone_overlay/Cargo.toml
+++ b/zone_overlay/Cargo.toml
@@ -1,20 +1,20 @@
[package]
name = "zone_overlay"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-description.workspace = true
-homepage.workspace = true
-repository.workspace = true
-license.workspace = true
-keywords.workspace = true
-categories.workspace = true
+version = { workspace = true }
+authors = { workspace = true }
+edition = { workspace = true }
+description = { workspace = true }
+homepage = { workspace = true }
+repository = { workspace = true }
+license = { workspace = true }
+keywords = { workspace = true }
+categories = { workspace = true }
workspace = ".."
[dependencies]
-figment = { version = "0.10.7", features = ["toml", "env"] }
+figment = { workspace = true }
fs_extra = "1.2.0"
-serde = { version = "1.0.145", features = ["derive"] }
-thiserror = "1.0.36"
+serde = { workspace = true, features = ["derive"] }
+thiserror = { workspace = true }
walkdir = "2.3.2"
-zone_core = { path = "../zone_core" }
+zone_core = { workspace = true }
diff --git a/zone_zfs/Cargo.toml b/zone_zfs/Cargo.toml
index a13cd91..a7883c9 100644
--- a/zone_zfs/Cargo.toml
+++ b/zone_zfs/Cargo.toml
@@ -1,14 +1,14 @@
[package]
name = "zone_zfs"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-description.workspace = true
-homepage.workspace = true
-repository.workspace = true
-license.workspace = true
-keywords.workspace = true
-categories.workspace = true
+version = { workspace = true }
+authors = { workspace = true }
+edition = { workspace = true }
+description = { workspace = true }
+homepage = { workspace = true }
+repository = { workspace = true }
+license = { workspace = true }
+keywords = { workspace = true }
+categories = { workspace = true }
workspace = ".."
[dependencies]
@@ -16,12 +16,12 @@ byte-unit = { version = "4.0.14", features = [
"serde",
], default-features = false }
derive_builder = "0.11.2"
-figment = { version = "0.10.7", features = ["toml", "env"] }
-serde = { version = "1.0.145", features = ["derive"] }
-thiserror = "1.0.36"
-tracing = "0.1.36"
-zone_core = { path = "../zone_core" }
+figment = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+thiserror = { workspace = true }
+tracing = { workspace = true }
+zone_core = { workspace = true }
[dev-dependencies]
-figment = { version = "*", features = ["test"] }
+figment = { workspace = true, features = ["test"] }
which = "4.3.0"
diff --git a/zoned/Cargo.toml b/zoned/Cargo.toml
index 13df451..347f6f5 100644
--- a/zoned/Cargo.toml
+++ b/zoned/Cargo.toml
@@ -1,30 +1,30 @@
[package]
name = "zoned"
-version.workspace = true
-authors.workspace = true
-edition.workspace = true
-description.workspace = true
-homepage.workspace = true
-repository.workspace = true
-license.workspace = true
-keywords.workspace = true
-categories.workspace = true
+version = { workspace = true }
+authors = { workspace = true }
+edition = { workspace = true }
+description = { workspace = true }
+homepage = { workspace = true }
+repository = { workspace = true }
+license = { workspace = true }
+keywords = { workspace = true }
+categories = { workspace = true }
workspace = ".."
[dependencies]
-anyhow = "1.0.65"
+anyhow = { workspace = true }
axum = { version = "0.5.16", features = ["json", "ws", "headers", "http2"] }
bytes = "1.2.1"
-figment = { version = "0.10.7", features = ["toml", "env", "test"] }
+figment = { workspace = true }
futures = "0.3.24"
-serde = "1.0.145"
-serde_json = "1.0.85"
-thiserror = "1.0.36"
-tokio = { version = "1.21.1", features = ["full"] }
-tracing = "0.1.36"
-tracing-subscriber = "0.3.15"
+serde = { workspace = true }
+serde_json = { workspace = true }
+thiserror = { workspace = true }
+tokio = { workspace = true, features = ["full"] }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
wspty = "0.1.1"
-zone_core = { path = "../zone_core" }
-zone_nspawn = { path = "../zone_nspawn" }
-zone_zfs = { path = "../zone_zfs" }
-zone_overlay = { path = "../zone_overlay" }
+zone_core = { workspace = true }
+zone_nspawn = { workspace = true }
+zone_overlay = { workspace = true }
+zone_zfs = { workspace = true }