Skip to content

Commit 5687faa

Browse files
cratelyncratelyn
committed
chore(deps): define tonic, tonic-build as workspace dependencies (#3473)
this commit modifies the workspace manifest, defining tonic and tonic-build as common workspace dependencies. no changes to the lockfile are made because this commit does not affect the dependency graph of the project. * linkerd/linkerd2#8733 Signed-off-by: katelyn martin <[email protected]>
1 parent b87455a commit 5687faa

File tree

22 files changed

+26
-24
lines changed

22 files changed

+26
-24
lines changed

‎Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ linkerd2-proxy-api = "0.15.0"
104104
prost = { version = "0.12" }
105105
prost-types = { version = "0.12" }
106106
tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "logging"] }
107+
tonic = { version = "0.10", default-features = false }
108+
tonic-build = { version = "0.10", default-features = false }
107109
# linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api.git", branch = "main" }
108110

109111
# NB: hyperium/hyper#3796 backports the server connection builder's

‎linkerd/app/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ regex = "1"
3232
thiserror = "2"
3333
tokio = { version = "1", features = ["rt"] }
3434
tokio-stream = { version = "0.1", features = ["time", "sync"] }
35-
tonic = { version = "0.10", default-features = false, features = ["prost"] }
35+
tonic = { workspace = true, default-features = false, features = ["prost"] }
3636
tower = "0.4"
3737
tracing = "0.1"

‎linkerd/app/core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ serde_json = "1"
2626
thiserror = "2"
2727
tokio = { version = "1", features = ["macros", "sync", "parking_lot"] }
2828
tokio-stream = { version = "0.1", features = ["time"] }
29-
tonic = { version = "0.10", default-features = false, features = ["prost"] }
29+
tonic = { workspace = true, default-features = false, features = ["prost"] }
3030
tracing = "0.1"
3131
parking_lot = "0.12"
3232
pin-project = "1"

‎linkerd/app/gateway/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ linkerd-proxy-client-policy = { path = "../../proxy/client-policy" }
1616
once_cell = "1"
1717
thiserror = "2"
1818
tokio = { version = "1", features = ["sync"] }
19-
tonic = { version = "0.10", default-features = false }
19+
tonic = { workspace = true, default-features = false }
2020
tower = { version = "0.4", default-features = false }
2121
tracing = "0.1"
2222

‎linkerd/app/inbound/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ parking_lot = "0.12"
3636
rangemap = "1"
3737
thiserror = "2"
3838
tokio = { version = "1", features = ["sync"] }
39-
tonic = { version = "0.10", default-features = false }
39+
tonic = { workspace = true, default-features = false }
4040
tower = { version = "0.4", features = ["util"] }
4141
tracing = "0.1"
4242

‎linkerd/app/integration/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ tokio-stream = { version = "0.1", features = ["sync"] }
5050
tokio-rustls = { workspace = true }
5151
rustls-pemfile = "2.2"
5252
tower = { version = "0.4", default-features = false }
53-
tonic = { version = "0.10", features = ["transport"], default-features = false }
53+
tonic = { workspace = true, features = ["transport"], default-features = false }
5454
tracing = "0.1"
5555
tracing-subscriber = { version = "0.3", default-features = false, features = [
5656
"fmt",

‎linkerd/app/outbound/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pin-project = "1"
2929
prometheus-client = "0.22"
3030
thiserror = "2"
3131
tokio = { version = "1", features = ["sync"] }
32-
tonic = { version = "0.10", default-features = false }
32+
tonic = { workspace = true, default-features = false }
3333
tower = { version = "0.4", features = ["util"] }
3434
tracing = "0.1"
3535

‎linkerd/app/test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ regex = "1"
2929
tokio = { version = "1", features = ["io-util", "net", "rt", "sync"] }
3030
tokio-test = "0.4"
3131
tokio-stream = { version = "0.1", features = ["sync"] }
32-
tonic = { version = "0.10", default-features = false, optional = true }
32+
tonic = { workspace = true, default-features = false, optional = true }
3333
tower = { version = "0.4", default-features = false }
3434
tracing = "0.1"
3535
thiserror = "2"

‎linkerd/opencensus/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ linkerd-error = { path = "../error" }
1414
linkerd-metrics = { path = "../metrics" }
1515
linkerd-trace-context = { path = "../trace-context" }
1616
opencensus-proto = { path = "../../opencensus-proto" }
17-
tonic = { version = "0.10", default-features = false, features = [
17+
tonic = { workspace = true, default-features = false, features = [
1818
"prost",
1919
"codegen",
2020
] }

‎linkerd/opentelemetry/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ linkerd-trace-context = { path = "../trace-context" }
1616
opentelemetry = { version = "0.27", default-features = false, features = ["trace"] }
1717
opentelemetry_sdk = { version = "0.27", default-features = false, features = ["trace"] }
1818
opentelemetry-proto = { path = "../../opentelemetry-proto" }
19-
tonic = { version = "0.10", default-features = false, features = [
19+
tonic = { workspace = true, default-features = false, features = [
2020
"prost",
2121
"codegen",
2222
] }

‎linkerd/proxy/api-resolve/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ http = { workspace = true }
2424
http-body = { workspace = true }
2525
pin-project = "1"
2626
prost = { workspace = true }
27-
tonic = { version = "0.10", default-features = false }
27+
tonic = { workspace = true, default-features = false }
2828
tower = { version = "0.4", default-features = false }
2929
tracing = "0.1"

‎linkerd/proxy/client-policy/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ipnet = "2"
2121
http = { workspace = true }
2222
once_cell = { version = "1" }
2323
prost-types = { workspace = true, optional = true }
24-
tonic = { version = "0.10", default-features = false }
24+
tonic = { workspace = true, default-features = false }
2525
thiserror = { version = "2", optional = true }
2626

2727
linkerd-error = { path = "../../error" }

‎linkerd/proxy/identity-client/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ parking_lot = "0.12"
1818
pin-project = "1"
1919
thiserror = "2"
2020
tokio = { version = "1", features = ["time", "sync"] }
21-
tonic = { version = "0.10", default-features = false }
21+
tonic = { workspace = true, default-features = false }
2222
tracing = "0.1"
2323
http-body = { workspace = true }

‎linkerd/proxy/spire-client/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ linkerd-tonic-watch = { path = "../../tonic-watch" }
1616
linkerd-exp-backoff = { path = "../../exp-backoff" }
1717
linkerd-stack = { path = "../../stack" }
1818
tokio = { version = "1", features = ["time", "sync"] }
19-
tonic = "0.10"
19+
tonic = { workspace = true }
2020
tower = "0.4"
2121
tracing = "0.1"
2222
x509-parser = "0.16.0"

‎linkerd/proxy/tap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ rand = { version = "0.8" }
2727
thiserror = "2"
2828
tokio = { version = "1", features = ["time"] }
2929
tower = { version = "0.4", default-features = false }
30-
tonic = { version = "0.10", default-features = false }
30+
tonic = { workspace = true, default-features = false }
3131
tracing = "0.1"
3232
pin-project = "1"
3333

‎linkerd/service-profiles/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ prost-types = { workspace = true }
2020
regex = "1"
2121
tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
2222
tokio-stream = { version = "0.1", features = ["sync"] }
23-
tonic = { version = "0.10", default-features = false }
23+
tonic = { workspace = true, default-features = false }
2424
tower = { version = "0.4.13", features = ["retry", "util"] }
2525
thiserror = "2"
2626
tracing = "0.1"

‎linkerd/tonic-stream/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ publish = false
1010
futures = { version = "0.3", default-features = false }
1111
linkerd-stack = { path = "../stack" }
1212
pin-project = "1"
13-
tonic = { version = "0.10", default-features = false }
13+
tonic = { workspace = true, default-features = false }
1414
tokio = { version = "1", features = ["time"] }
1515
tracing = "0.1"
1616

‎linkerd/tonic-watch/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Provides a utility for creating robust watches from a service that returns a str
1313
futures = { version = "0.3", default-features = false }
1414
linkerd-error = { path = "../error" }
1515
linkerd-stack = { path = "../stack" }
16-
tonic = { version = "0.10", default-features = false }
16+
tonic = { workspace = true, default-features = false }
1717
tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
1818
tracing = "0.1"
1919

‎opencensus-proto/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ prost = { workspace = true }
1717
prost-types = { workspace = true }
1818

1919
[dependencies.tonic]
20-
version = "0.10"
20+
workspace = true
2121
default-features = false
2222
features = ["prost", "codegen"]
2323

2424
[dev-dependencies.tonic-build]
25-
version = "0.10"
25+
workspace = true
2626
default-features = false
2727
features = ["prost"]
2828

‎opentelemetry-proto/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ Vendored from https://github.com/open-telemetry/opentelemetry-rust/.
1212
"""
1313

1414
[dependencies]
15-
tonic = { version = "0.10", features = ["codegen", "prost", "transport"] }
15+
tonic = { workspace = true, features = ["codegen", "prost", "transport"] }
1616
prost = { workspace = true }
1717
opentelemetry = { version = "0.27", default-features = false, features = ["trace"] }
1818
opentelemetry_sdk = { version = "0.27", default-features = false, features = ["trace"] }
1919

2020
[dev-dependencies]
2121
opentelemetry = { version = "0.27", default-features = false, features = ["trace", "testing"] }
22-
tonic-build = { version = "0.10", default-features = false, features = ["prost"] }
22+
tonic-build = { workspace = true, default-features = false, features = ["prost"] }
2323

2424
[lib]
2525
doctest = false

‎spiffe-proto/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ prost = { workspace = true }
1212
prost-types = { workspace = true }
1313

1414
[dependencies.tonic]
15-
version = "0.10"
15+
workspace = true
1616
default-features = false
1717
features = ["prost", "codegen"]
1818

1919
[dev-dependencies.tonic-build]
20-
version = "0.10"
20+
workspace = true
2121
default-features = false
2222
features = ["prost"]
2323

‎tools/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ license = "Apache-2.0"
66
publish = false
77

88
[dependencies.tonic-build]
9-
version = "0.10"
9+
workspace = true
1010
default-features = false
1111
features = ["prost"]

0 commit comments

Comments
 (0)