Skip to content

Commit a22119c

Browse files
rylevrylev
authored
Merge pull request #2861 from fermyon/unify-tokio-dep
Unify tokio (and serde_json) under workspace dependencies
2 parents a6c1fa7 + 9c492fd commit a22119c

File tree

37 files changed

+117
-130
lines changed

37 files changed

+117
-130
lines changed

‎Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ serde_json = { workspace = true }
4646
sha2 = { workspace = true }
4747
subprocess = "0.2"
4848
tempfile = { workspace = true }
49-
tokio = { version = "1", features = ["full"] }
49+
tokio = { workspace = true, features = ["full"] }
5050
toml = { workspace = true }
5151
tracing = { workspace = true }
5252
url = { workspace = true }
@@ -148,6 +148,7 @@ sha2 = "0.10"
148148
tempfile = "3"
149149
test-environment = { git = "https://github.com/fermyon/conformance-tests", rev = "387b7f375df59e6254a7c29cf4a53507a9f46d32" }
150150
thiserror = "1"
151+
tokio = "1"
151152
toml = "0.8"
152153
tracing = { version = "0.1", features = ["log"] }
153154
tracing-opentelemetry = { version = "0.26", default-features = false, features = ["metrics"] }

‎crates/build/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ spin-common = { path = "../common" }
1212
spin-manifest = { path = "../manifest" }
1313
subprocess = "0.2"
1414
terminal = { path = "../terminal" }
15-
tokio = { version = "1", features = ["full"] }
15+
tokio = { workspace = true, features = ["full"] }
1616
toml = { workspace = true }
1717
tracing = { workspace = true }

‎crates/common/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ anyhow = { workspace = true }
99
dirs = { workspace = true }
1010
sha2 = { workspace = true }
1111
tempfile = { workspace = true }
12-
tokio = { version = "1", features = ["rt", "time"] }
12+
tokio = { workspace = true, features = ["rt", "time"] }
1313
url = { workspace = true }

‎crates/componentize/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ rand_core = "0.6"
2626
serde = { workspace = true }
2727
serde_json = { workspace = true }
2828
tempfile = { workspace = true }
29-
tokio = { version = "1", features = ["macros", "rt", "fs"] }
29+
tokio = { workspace = true, features = ["macros", "rt", "fs"] }
3030
toml = { workspace = true }
3131
wasmtime = { workspace = true }
3232
wasmtime-wasi = { workspace = true }

‎crates/core/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ tracing = { workspace = true }
1111
wasmtime = { workspace = true }
1212

1313
[dev-dependencies]
14-
serde_json = "1"
14+
serde_json = { workspace = true }
1515
spin-componentize = { workspace = true }
1616
spin-factor-wasi = { path = "../factor-wasi" }
1717
spin-factors = { path = "../factors" }
1818
spin-factors-test = { path = "../factors-test" }
1919
spin-locked-app = { path = "../locked-app" }
20-
tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] }
20+
tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread"] }
2121
wasmtime-wasi = { workspace = true }
2222

2323
[features]

‎crates/doctor/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ spin-common = { path = "../common" }
1414
spin-manifest = { path = "../manifest" }
1515
tempfile = { workspace = true }
1616
terminal = { path = "../terminal" }
17-
tokio = { version = "1", features = ["process"] }
17+
tokio = { workspace = true, features = ["process"] }
1818
toml = { workspace = true }
1919
toml_edit = { version = "0.22", features = ["serde"] }
2020
tracing = { workspace = true }
2121

2222
[dev-dependencies]
2323
glob = { workspace = true }
2424
tempfile = { workspace = true }
25-
tokio = { version = "1", features = ["macros", "rt"] }
25+
tokio = { workspace = true, features = ["macros", "rt"] }
2626
ui-testing = { path = "../ui-testing" }
2727

2828
[[test]]

‎crates/expressions/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ spin-locked-app = { path = "../locked-app" }
1212
thiserror = { workspace = true }
1313

1414
[dev-dependencies]
15-
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
15+
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
1616
toml = { workspace = true }

‎crates/factor-key-value/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spin-factors = { path = "../factors" }
1313
spin-locked-app = { path = "../locked-app" }
1414
spin-world = { path = "../world" }
1515
table = { path = "../table" }
16-
tokio = { version = "1", features = ["macros", "sync", "rt"] }
16+
tokio = { workspace = true, features = ["macros", "sync", "rt"] }
1717
toml = { workspace = true }
1818
tracing = { workspace = true }
1919

@@ -22,7 +22,7 @@ spin-factors-test = { path = "../factors-test" }
2222
spin-key-value-redis = { path = "../key-value-redis" }
2323
spin-key-value-spin = { path = "../key-value-spin" }
2424
tempfile = { workspace = true }
25-
tokio = { version = "1", features = ["macros", "rt"] }
25+
tokio = { workspace = true, features = ["macros", "rt"] }
2626

2727

2828
[lints]

‎crates/factor-llm/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ spin-llm-local = { path = "../llm-local", optional = true }
2222
spin-llm-remote-http = { path = "../llm-remote-http" }
2323
spin-locked-app = { path = "../locked-app" }
2424
spin-world = { path = "../world" }
25-
tokio = { version = "1", features = ["sync"] }
25+
tokio = { workspace = true, features = ["sync"] }
2626
toml = { workspace = true }
2727
tracing = { workspace = true }
2828
url = { version = "2", features = ["serde"] }
2929

3030
[dev-dependencies]
3131
spin-factors-test = { path = "../factors-test" }
32-
tokio = { version = "1", features = ["macros", "rt"] }
32+
tokio = { workspace = true, features = ["macros", "rt"] }
3333

3434
[lints]
3535
workspace = true

‎crates/factor-outbound-http/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spin-factors = { path = "../factors" }
1717
spin-telemetry = { path = "../telemetry" }
1818
spin-world = { path = "../world" }
1919
terminal = { path = "../terminal" }
20-
tokio = { version = "1", features = ["macros", "rt", "net"] }
20+
tokio = { workspace = true, features = ["macros", "rt", "net"] }
2121
tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "tls12"] }
2222
tracing = { workspace = true }
2323
wasmtime = { workspace = true }

‎crates/factor-outbound-mqtt/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
1212
spin-factors = { path = "../factors" }
1313
spin-world = { path = "../world" }
1414
table = { path = "../table" }
15-
tokio = { version = "1", features = ["sync"] }
15+
tokio = { workspace = true, features = ["sync"] }
1616
tracing = { workspace = true }
1717

1818
[dev-dependencies]
1919
spin-factor-variables = { path = "../factor-variables" }
2020
spin-factors-test = { path = "../factors-test" }
21-
tokio = { version = "1", features = ["macros", "rt"] }
21+
tokio = { workspace = true, features = ["macros", "rt"] }
2222

2323
[lints]
2424
workspace = true

‎crates/factor-outbound-mysql/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
2323
spin-factors = { path = "../factors" }
2424
spin-world = { path = "../world" }
2525
table = { path = "../table" }
26-
tokio = { version = "1", features = ["rt-multi-thread"] }
26+
tokio = { workspace = true, features = ["rt-multi-thread"] }
2727
tracing = { workspace = true }
2828
url = { workspace = true }
2929

‎crates/factor-outbound-networking/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ webpki-roots = "0.26"
2929
[dev-dependencies]
3030
spin-factors-test = { path = "../factors-test" }
3131
tempfile = { workspace = true }
32-
tokio = { version = "1", features = ["macros", "rt"] }
32+
tokio = { workspace = true, features = ["macros", "rt"] }
3333
toml = { workspace = true }
3434
wasmtime-wasi = { workspace = true }
3535

‎crates/factor-outbound-pg/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
1313
spin-factors = { path = "../factors" }
1414
spin-world = { path = "../world" }
1515
table = { path = "../table" }
16-
tokio = { version = "1", features = ["rt-multi-thread"] }
16+
tokio = { workspace = true, features = ["rt-multi-thread"] }
1717
tokio-postgres = "0.7"
1818
tracing = { workspace = true }
1919

2020
[dev-dependencies]
2121
spin-factor-variables = { path = "../factor-variables" }
2222
spin-factors-test = { path = "../factors-test" }
23-
tokio = { version = "1", features = ["macros", "rt"] }
23+
tokio = { workspace = true, features = ["macros", "rt"] }
2424

2525
[lints]
2626
workspace = true

‎crates/factor-outbound-redis/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tracing = { workspace = true }
1717
[dev-dependencies]
1818
spin-factor-variables = { path = "../factor-variables" }
1919
spin-factors-test = { path = "../factors-test" }
20-
tokio = { version = "1", features = ["macros", "rt"] }
20+
tokio = { workspace = true, features = ["macros", "rt"] }
2121

2222
[lints]
2323
workspace = true

‎crates/factor-sqlite/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ spin-factors = { path = "../factors" }
1515
spin-locked-app = { path = "../locked-app" }
1616
spin-world = { path = "../world" }
1717
table = { path = "../table" }
18-
tokio = "1"
18+
tokio = { workspace = true }
1919
toml = { workspace = true }
2020
tracing = { workspace = true }
2121

2222
[dev-dependencies]
2323
spin-factors-test = { path = "../factors-test" }
24-
tokio = { version = "1", features = ["macros", "rt"] }
24+
tokio = { workspace = true, features = ["macros", "rt"] }
2525

2626
[lints]
2727
workspace = true

‎crates/factor-variables/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ serde = { workspace = true }
1313
spin-expressions = { path = "../expressions" }
1414
spin-factors = { path = "../factors" }
1515
spin-world = { path = "../world" }
16-
tokio = { version = "1", features = ["rt-multi-thread"] }
16+
tokio = { workspace = true, features = ["rt-multi-thread"] }
1717
toml = { workspace = true }
1818
tracing = { workspace = true }
1919
vaultrs = "0.7"
2020

2121
[dev-dependencies]
2222
spin-factors-test = { path = "../factors-test" }
23-
tokio = { version = "1", features = ["macros", "rt"] }
23+
tokio = { workspace = true, features = ["macros", "rt"] }
2424

2525
[lints]
2626
workspace = true

‎crates/factor-wasi/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ bytes = { workspace = true }
1010
cap-primitives = "3.0.0"
1111
spin-common = { path = "../common" }
1212
spin-factors = { path = "../factors" }
13-
tokio = { version = "1" }
13+
tokio = { workspace = true }
1414
wasmtime = { workspace = true }
1515
wasmtime-wasi = { workspace = true }
1616

1717
[dev-dependencies]
1818
spin-factors-test = { path = "../factors-test" }
19-
tokio = { version = "1", features = ["macros", "rt"] }
19+
tokio = { workspace = true, features = ["macros", "rt"] }
2020

2121
[lints]
2222
workspace = true

‎crates/factors-executor/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spin-factors = { path = "../factors" }
1717
[dev-dependencies]
1818
spin-factor-wasi = { path = "../factor-wasi" }
1919
spin-factors-test = { path = "../factors-test" }
20-
tokio = { version = "1", features = ["macros", "rt"] }
20+
tokio = { workspace = true, features = ["macros", "rt"] }
2121

2222
[lints]
2323
workspace = true

‎crates/key-value-azure/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ futures = { workspace = true }
1616
serde = { workspace = true }
1717
spin-core = { path = "../core" }
1818
spin-factor-key-value = { path = "../factor-key-value" }
19-
tokio = "1"
19+
tokio = { workspace = true }
2020
url = { workspace = true }
2121

2222
[lints]

‎crates/key-value-redis/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ serde = { workspace = true }
1111
spin-core = { path = "../core" }
1212
spin-factor-key-value = { path = "../factor-key-value" }
1313
spin-world = { path = "../world" }
14-
tokio = "1"
14+
tokio = { workspace = true }
1515
url = { workspace = true }
1616

1717
[lints]

‎crates/key-value-spin/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ serde = { workspace = true }
1111
spin-core = { path = "../core" }
1212
spin-factor-key-value = { path = "../factor-key-value" }
1313
spin-world = { path = "../world" }
14-
tokio = { version = "1", features = ["rt-multi-thread"] }
14+
tokio = { workspace = true, features = ["rt-multi-thread"] }
1515

1616
[lints]
1717
workspace = true

‎crates/llm-local/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ num_cpus = "1"
1515
rand = { workspace = true }
1616
safetensors = "0.4"
1717
serde = { workspace = true }
18-
serde_json = "1"
18+
serde_json = { workspace = true }
1919
spin-common = { path = "../common" }
2020
spin-core = { path = "../core" }
2121
spin-world = { path = "../world" }
2222
terminal = { path = "../terminal" }
2323
tokenizers = "0.20"
24-
tokio = { version = "1", features = ["macros", "sync", "fs"] }
24+
tokio = { workspace = true, features = ["macros", "sync", "fs"] }
2525
tracing = { workspace = true }
2626

2727
[features]

‎crates/loader/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ spin-serde = { path = "../serde" }
3131
tempfile = { workspace = true }
3232
terminal = { path = "../terminal" }
3333
thiserror = { workspace = true }
34-
tokio = "1"
34+
tokio = { workspace = true }
3535
tokio-util = "0.7"
3636
toml = { workspace = true }
3737
tracing = { workspace = true }
3838
walkdir = "2"
3939
wasm-pkg-loader = "0.4"
4040

4141
[dev-dependencies]
42-
tokio = { version = "1", features = ["rt", "macros"] }
42+
tokio = { workspace = true, features = ["rt", "macros"] }
4343
ui-testing = { path = "../ui-testing" }
4444

4545
[features]

‎crates/oci/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spin-loader = { path = "../loader" }
2727
spin-locked-app = { path = "../locked-app" }
2828
spin-manifest = { path = "../manifest" }
2929
tempfile = { workspace = true }
30-
tokio = { version = "1", features = ["fs"] }
30+
tokio = { workspace = true, features = ["fs"] }
3131
tokio-util = { version = "0.7", features = ["compat"] }
3232
tracing = { workspace = true }
3333
walkdir = "2"

‎crates/plugins/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ tar = "0.4"
2222
tempfile = { workspace = true }
2323
terminal = { path = "../terminal" }
2424
thiserror = { workspace = true }
25-
tokio = { version = "1", features = ["fs", "process", "rt", "macros"] }
25+
tokio = { workspace = true, features = ["fs", "process", "rt", "macros"] }
2626
tracing = { workspace = true }
2727
url = { version = "2", features = ["serde"] }

‎crates/runtime-config/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ toml = { workspace = true }
3434
spin-factors-test = { path = "../factors-test" }
3535
spin-world = { path = "../world" }
3636
tempfile = "3.2"
37-
tokio = { version = "1", features = ["macros"] }
37+
tokio = { workspace = true, features = ["macros"] }
3838
toml = "0.8"
3939

4040
[lints]

‎crates/sqlite-inproc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ rand = { workspace = true }
1111
rusqlite = { version = "0.32", features = ["bundled"] }
1212
spin-factor-sqlite = { path = "../factor-sqlite" }
1313
spin-world = { path = "../world" }
14-
tokio = "1"
14+
tokio = { workspace = true }
1515

1616
[lints]
1717
workspace = true

‎crates/sqlite-libsql/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ rusqlite = { version = "0.32", features = ["bundled"] }
1414
spin-factor-sqlite = { path = "../factor-sqlite" }
1515
spin-world = { path = "../world" }
1616
sqlparser = "0.51"
17-
tokio = { version = "1", features = ["full"] }
17+
tokio = { workspace = true, features = ["full"] }
1818

1919
[lints]
2020
workspace = true

‎crates/sqlite/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ spin-sqlite-inproc = { path = "../sqlite-inproc" }
1414
spin-sqlite-libsql = { path = "../sqlite-libsql" }
1515
spin-world = { path = "../world" }
1616
table = { path = "../table" }
17-
tokio = "1"
17+
tokio = { workspace = true }
1818
toml = { workspace = true }

‎crates/templates/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ serde = { workspace = true }
2828
spin-common = { path = "../common" }
2929
spin-manifest = { path = "../manifest" }
3030
tempfile = { workspace = true }
31-
tokio = { version = "1", features = ["fs", "process", "rt", "macros"] }
31+
tokio = { workspace = true, features = ["fs", "process", "rt", "macros"] }
3232
toml = { workspace = true }
3333
toml_edit = "0.22"
3434
url = { workspace = true }

‎crates/trigger-http/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ rustls = { workspace = true }
2323
rustls-pemfile = "2.1.2"
2424
rustls-pki-types = "1.7"
2525
serde = { workspace = true }
26-
serde_json = "1"
26+
serde_json = { workspace = true }
2727
spin-app = { path = "../app" }
2828
spin-core = { path = "../core" }
2929
spin-factor-outbound-http = { path = "../factor-outbound-http" }
@@ -35,7 +35,7 @@ spin-telemetry = { path = "../telemetry" }
3535
spin-trigger = { path = "../trigger" }
3636
spin-world = { path = "../world" }
3737
terminal = { path = "../terminal" }
38-
tokio = { version = "1", features = ["full"] }
38+
tokio = { workspace = true, features = ["full"] }
3939
tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "tls12"] }
4040
tracing = { workspace = true }
4141
url = { workspace = true }

‎crates/trigger-redis/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spin-factors = { path = "../factors" }
1818
spin-telemetry = { path = "../telemetry" }
1919
spin-trigger = { path = "../trigger" }
2020
spin-world = { path = "../world" }
21-
tokio = { version = "1", features = ["macros", "rt"] }
21+
tokio = { workspace = true, features = ["macros", "rt"] }
2222
tracing = { workspace = true }
2323

2424
[lints]

0 commit comments

Comments
 (0)