Skip to content

Commit 8c123ec

Browse files
committed
Re-unify crates at workspace
This commit re-unifies our crates at the workspace level, reversing a process begun in #1181 in order to upgrade hyper et al in a feasible way. Signed-off-by: Brian L. Troutwine <[email protected]>
1 parent 028c413 commit 8c123ec

File tree

5 files changed

+18
-14
lines changed

5 files changed

+18
-14
lines changed

Cargo.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,20 @@ thiserror = { version = "2.0" }
2727
tokio = { version = "1.41" }
2828
# If you update tonic, search for tonic-build in sub-crates and update their
2929
# version.
30-
tonic = { version = "0.9", default-features = false, features = [] }
30+
tonic = { version = "0.12", default-features = false, features = [] }
3131
tower = { version = "0.5", default-features = false }
3232
tracing = { version = "0.1" }
3333
uuid = { version = "1.11", default-features = false, features = [
3434
"v4",
3535
"serde",
3636
] }
3737
once_cell = { version = "1.20" }
38-
hyper = { version = "0.14", default-features = false }
3938

39+
http = { version = "1.2" }
40+
http-body-util = { version = "0.1" }
41+
http-serde = { version = "2.1" }
42+
hyper = { version = "1.5", default-features = false }
43+
hyper-util = { version = "0.1", default-features = false }
4044

4145
[profile.release]
4246
lto = true # Optimize our binary at link stage.

integration/ducks/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ publish = false
1111
anyhow = "1.0"
1212
bytes = { workspace = true }
1313
entropy = "0.4"
14-
http-body-util = "0.1"
15-
hyper = { version = "1.5", features = ["server"] }
16-
hyper-util = "0.1"
14+
http-body-util = { workspace = true }
15+
hyper = { workspace = true, features = ["server"] }
16+
hyper-util = { workspace = true }
1717
once_cell = { workspace = true }
1818
shared = { path = "../shared" }
1919
sketches-ddsketch = "0.3"
@@ -28,7 +28,7 @@ tokio = { workspace = true, features = [
2828
"net",
2929
] }
3030
tokio-stream = { version = "0.1", features = ["net"] }
31-
tonic = { version = "0.12", default-features = false, features = [
31+
tonic = { workspace = true, default-features = false, features = [
3232
"transport",
3333
"prost",
3434
] }

integration/shared/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ publish = false
99

1010
[dependencies]
1111
serde = { version = "1.0", features = ["derive"] }
12-
tonic = { version = "0.12", default-features = false, features = [
12+
tonic = { workspace = true, default-features = false, features = [
1313
"codegen",
1414
"prost",
1515
"transport",

integration/sheepdog/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ tokio = { version = "1.41", features = [
2222
"time",
2323
"net",
2424
] }
25-
tonic = { version = "0.12", default-features = false, features = [
25+
tonic = { workspace = true, default-features = false, features = [
2626
"transport",
2727
"prost",
2828
] }
29-
hyper-util = "0.1"
30-
tower = { version = "0.5", features = [
29+
hyper-util = { workspace = true }
30+
tower = { workspace = true, features = [
3131
"timeout",
3232
"limit",
3333
"load-shed",

lading/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ flate2 = { version = "1.0.34", default-features = false, features = [
3737
futures = "0.3.31"
3838
fuser = { version = "0.15", optional = true }
3939
heck = { version = "0.5", default-features = false }
40-
http = "1.2"
40+
http = { workspace = true }
41+
http-body-util = { workspace = true }
4142
http-serde = "2.1"
42-
hyper = { version = "1.5", features = ["client", "http1", "http2", "server"] }
43-
http-body-util = "0.1"
44-
hyper-util = { version = "0.1", features = ["default", "client", "client-legacy"] }
43+
hyper = { workspace = true, features = ["client", "http1", "http2", "server"] }
44+
hyper-util = { workspace = true, features = ["default", "client", "client-legacy"] }
4545
is_executable = "1.0.4"
4646
metrics = { workspace = true }
4747
metrics-exporter-prometheus = { workspace = true }

0 commit comments

Comments
 (0)