Skip to content

Commit b1c1038

Browse files
committed
bridge: Use workspace dependencies
… to ensure all crates use the same versions of shared dependencies.
1 parent 2afe62f commit b1c1038

File tree

6 files changed

+39
-29
lines changed

6 files changed

+39
-29
lines changed

bridge/Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bridge/Cargo.toml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,21 @@
66
resolver = "2"
77

88
members = [
9-
"svix-bridge-types",
109
"svix-bridge",
10+
"svix-bridge-types",
1111
"svix-bridge-plugin-queue",
1212
"svix-bridge-plugin-kafka",
1313
]
1414

15+
[workspace.dependencies]
16+
serde = { version = "1.0.203", features = ["derive"] }
17+
serde_json = "1.0.117"
18+
svix-bridge-types = { path = "svix-bridge-types" }
19+
thiserror = "1.0.61"
20+
tokio = "1.38.0"
21+
tracing = "0.1.40"
22+
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
23+
wiremock = "0.6.0"
24+
1525
[profile.dev.package]
1626
quote = { opt-level = 2 }

bridge/svix-bridge-plugin-kafka/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ publish = false
66

77
[dependencies]
88
rdkafka = { version = "0.36.0", features = ["cmake-build", "ssl", "tracing"] }
9-
serde = { version = "1.0", features = ["derive"] }
10-
serde_json = "1.0.117"
11-
svix-bridge-types = { path = "../svix-bridge-types" }
12-
thiserror = "1.0.61"
13-
tokio = { version = "1.28.1", features = ["time"] }
14-
tracing = "0.1.40"
9+
serde.workspace = true
10+
serde_json.workspace = true
11+
svix-bridge-types.workspace = true
12+
thiserror.workspace = true
13+
tokio = { workspace = true, features = ["time"] }
14+
tracing.workspace = true
1515

1616
[dev-dependencies]
1717
ctor = "0.2.8"
18-
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
19-
wiremock = "0.6.0"
18+
tracing-subscriber.workspace = true
19+
wiremock.workspace = true

bridge/svix-bridge-plugin-queue/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ edition = "2021"
55
publish = false
66

77
[dependencies]
8-
serde_json = "1.0"
9-
serde = { version = "1.0", features = ["derive"] }
10-
svix-bridge-types = { path = "../svix-bridge-types" }
11-
thiserror = "1.0.61"
12-
tokio = { version = "1", features = ["full"] }
8+
serde.workspace = true
9+
serde_json.workspace = true
10+
svix-bridge-types.workspace = true
11+
thiserror.workspace = true
12+
tokio = { workspace = true, features = ["full"] }
1313
tokio-executor-trait = "2.1"
1414
tokio-reactor-trait = "1.1"
1515
tracing = "0.1"
@@ -28,5 +28,5 @@ google-cloud-googleapis = "0.12.0"
2828
google-cloud-pubsub = "0.24.0"
2929
lapin = "2"
3030
redis = { version = "0.25.4", features = ["tokio-comp", "streams"] }
31-
tracing-subscriber = "0.3"
32-
wiremock = "0.6.0"
31+
tracing-subscriber.workspace = true
32+
wiremock.workspace = true

bridge/svix-bridge-types/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ publish = false
66

77
[dependencies]
88
async-trait = "0.1"
9-
tokio = { version = "1", features = ["full"] }
10-
serde_json = "1"
11-
serde = { version = "1", features = ["derive"] }
9+
tokio = { workspace = true, features = ["full"] }
10+
serde.workspace = true
11+
serde_json.workspace = true
1212
svix = "1.17.0"

bridge/svix-bridge/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ once_cell = "1.18.0"
1414
opentelemetry = "0.22.0"
1515
opentelemetry_sdk = { version = "0.22.1", features = ["metrics", "rt-tokio"] }
1616
opentelemetry-otlp = { version = "0.15.0", features = ["metrics", "grpc-tonic", "http-proto", "reqwest-client"] }
17-
serde = { version = "1", features = ["derive"] }
18-
serde_json = "1"
17+
serde.workspace = true
18+
serde_json.workspace = true
1919
serde_yaml = "0.9"
2020
svix-ksuid = "0.7.0"
2121
svix-bridge-plugin-queue = { path = "../svix-bridge-plugin-queue" }
2222
svix-bridge-plugin-kafka = { optional = true, path = "../svix-bridge-plugin-kafka" }
23-
svix-bridge-types = { path = "../svix-bridge-types" }
24-
tokio = { version = "1", features = ["full"] }
25-
tracing = "0.1"
23+
svix-bridge-types.workspace = true
24+
tokio = { workspace = true, features = ["full"] }
25+
tracing.workspace = true
2626
tracing-opentelemetry = "0.23.0"
27-
tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt", "json"] }
27+
tracing-subscriber = { workspace = true, features = ["fmt", "json"] }
2828
# N.b. for newer deno versions (like this) the runtimes must be retained and reused since they will leak memory if you
2929
# create/drop them.
3030
deno_core = "0.204.0"

0 commit comments

Comments
 (0)