Skip to content

Commit

Permalink
Unify tokio (and serde_json) under workspace dependencies
Browse files Browse the repository at this point in the history 
Signed-off-by: Ryan Levick <[email protected]>
  • Loading branch information
@rylev
rylev committed Sep 24, 2024
1 parent 7531cd4 commit 543262f
Show file tree
Hide file tree
Showing 37 changed files with 52 additions and 51 deletions.
3 changes: 2 additions & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ serde_json = { workspace = true }
sha2 = { workspace = true }
subprocess = "0.2"
tempfile = { workspace = true }
tokio = { version = "1", features = ["full"] }
tokio = { workspace = true, features = ["full"] }
toml = { workspace = true }
tracing = { workspace = true }
url = { workspace = true }
Expand Down Expand Up @@ -148,6 +148,7 @@ sha2 = "0.10"
tempfile = "3"
test-environment = { git = "https://github.com/fermyon/conformance-tests", rev = "387b7f375df59e6254a7c29cf4a53507a9f46d32" }
thiserror = "1"
tokio = "1"
toml = "0.8"
tracing = { version = "0.1", features = ["log"] }
tracing-opentelemetry = { version = "0.26", default-features = false, features = ["metrics"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/build/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ spin-common = { path = "../common" }
spin-manifest = { path = "../manifest" }
subprocess = "0.2"
terminal = { path = "../terminal" }
tokio = { version = "1", features = ["full"] }
tokio = { workspace = true, features = ["full"] }
toml = { workspace = true }
tracing = { workspace = true }
2 changes: 1 addition & 1 deletion crates/common/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ anyhow = { workspace = true }
dirs = { workspace = true }
sha2 = { workspace = true }
tempfile = { workspace = true }
tokio = { version = "1", features = ["rt", "time"] }
tokio = { workspace = true, features = ["rt", "time"] }
url = { workspace = true }
2 changes: 1 addition & 1 deletion crates/componentize/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ rand_core = "0.6"
serde = { workspace = true }
serde_json = { workspace = true }
tempfile = { workspace = true }
tokio = { version = "1", features = ["macros", "rt", "fs"] }
tokio = { workspace = true, features = ["macros", "rt", "fs"] }
toml = { workspace = true }
wasmtime = { workspace = true }
wasmtime-wasi = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ tracing = { workspace = true }
wasmtime = { workspace = true }

[dev-dependencies]
serde_json = "1"
serde_json = { workspace = true }
spin-componentize = { workspace = true }
spin-factor-wasi = { path = "../factor-wasi" }
spin-factors = { path = "../factors" }
spin-factors-test = { path = "../factors-test" }
spin-locked-app = { path = "../locked-app" }
tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] }
tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread"] }
wasmtime-wasi = { workspace = true }
4 changes: 2 additions & 2 deletions crates/doctor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ spin-common = { path = "../common" }
spin-manifest = { path = "../manifest" }
tempfile = { workspace = true }
terminal = { path = "../terminal" }
tokio = { version = "1", features = ["process"] }
tokio = { workspace = true, features = ["process"] }
toml = { workspace = true }
toml_edit = { version = "0.22", features = ["serde"] }
tracing = { workspace = true }

[dev-dependencies]
glob = { workspace = true }
tempfile = { workspace = true }
tokio = { version = "1", features = ["macros", "rt"] }
tokio = { workspace = true, features = ["macros", "rt"] }
ui-testing = { path = "../ui-testing" }

[[test]]
Expand Down
2 changes: 1 addition & 1 deletion crates/expressions/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ spin-locked-app = { path = "../locked-app" }
thiserror = { workspace = true }

[dev-dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
toml = { workspace = true }
6 changes: 3 additions & 3 deletions crates/factor-key-value/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ spin-factors = { path = "../factors" }
spin-locked-app = { path = "../locked-app" }
spin-world = { path = "../world" }
table = { path = "../table" }
tokio = { version = "1", features = ["macros", "sync", "rt"] }
tokio = { workspace = true, features = ["macros", "sync", "rt"] }
toml = { workspace = true }
tracing = { workspace = true }

[dev-dependencies]
spin-factors-test = { path = "../factors-test" }
spin-key-value-spin = { path = "../key-value-spin" }
spin-key-value-redis = { path = "../key-value-redis" }
spin-key-value-spin = { path = "../key-value-spin" }
tempfile = { workspace = true }
tokio = { version = "1", features = ["macros", "rt"] }
tokio = { workspace = true, features = ["macros", "rt"] }


[lints]
Expand Down
4 changes: 2 additions & 2 deletions crates/factor-llm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ spin-llm-local = { path = "../llm-local", optional = true }
spin-llm-remote-http = { path = "../llm-remote-http" }
spin-locked-app = { path = "../locked-app" }
spin-world = { path = "../world" }
tokio = { version = "1", features = ["sync"] }
tokio = { workspace = true, features = ["sync"] }
toml = { workspace = true }
tracing = { workspace = true }
url = { version = "2", features = ["serde"] }

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

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/factor-outbound-http/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spin-factors = { path = "../factors" }
spin-telemetry = { path = "../telemetry" }
spin-world = { path = "../world" }
terminal = { path = "../terminal" }
tokio = { version = "1", features = ["macros", "rt", "net"] }
tokio = { workspace = true, features = ["macros", "rt", "net"] }
tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "tls12"] }
tracing = { workspace = true }
wasmtime = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/factor-outbound-mqtt/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
spin-factors = { path = "../factors" }
spin-world = { path = "../world" }
table = { path = "../table" }
tokio = { version = "1", features = ["sync"] }
tokio = { workspace = true, features = ["sync"] }
tracing = { workspace = true }

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

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/factor-outbound-mysql/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
spin-factors = { path = "../factors" }
spin-world = { path = "../world" }
table = { path = "../table" }
tokio = { version = "1", features = ["rt-multi-thread"] }
tokio = { workspace = true, features = ["rt-multi-thread"] }
tracing = { workspace = true }
url = { workspace = true }

Expand Down
2 changes: 1 addition & 1 deletion crates/factor-outbound-networking/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ webpki-roots = "0.26"
[dev-dependencies]
spin-factors-test = { path = "../factors-test" }
tempfile = { workspace = true }
tokio = { version = "1", features = ["macros", "rt"] }
tokio = { workspace = true, features = ["macros", "rt"] }
toml = { workspace = true }
wasmtime-wasi = { workspace = true }

Expand Down
4 changes: 2 additions & 2 deletions crates/factor-outbound-pg/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ spin-factor-outbound-networking = { path = "../factor-outbound-networking" }
spin-factors = { path = "../factors" }
spin-world = { path = "../world" }
table = { path = "../table" }
tokio = { version = "1", features = ["rt-multi-thread"] }
tokio = { workspace = true, features = ["rt-multi-thread"] }
tokio-postgres = "0.7"
tracing = { workspace = true }

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

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/factor-outbound-redis/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ tracing = { workspace = true }
[dev-dependencies]
spin-factor-variables = { path = "../factor-variables" }
spin-factors-test = { path = "../factors-test" }
tokio = { version = "1", features = ["macros", "rt"] }
tokio = { workspace = true, features = ["macros", "rt"] }

[lints]
workspace = true
4 changes: 2 additions & 2 deletions crates/factor-sqlite/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ spin-factors = { path = "../factors" }
spin-locked-app = { path = "../locked-app" }
spin-world = { path = "../world" }
table = { path = "../table" }
tokio = "1"
tokio = { workspace = true }
toml = { workspace = true }
tracing = { workspace = true }

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

[lints]
workspace = true
4 changes: 2 additions & 2 deletions crates/factor-variables/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ serde = { workspace = true }
spin-expressions = { path = "../expressions" }
spin-factors = { path = "../factors" }
spin-world = { path = "../world" }
tokio = { version = "1", features = ["rt-multi-thread"] }
tokio = { workspace = true, features = ["rt-multi-thread"] }
toml = { workspace = true }
tracing = { workspace = true }
vaultrs = "0.7"

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

[lints]
workspace = true
4 changes: 2 additions & 2 deletions crates/factor-wasi/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ bytes = { workspace = true }
cap-primitives = "3.0.0"
spin-common = { path = "../common" }
spin-factors = { path = "../factors" }
tokio = { version = "1" }
tokio = { workspace = true }
wasmtime = { workspace = true }
wasmtime-wasi = { workspace = true }

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

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/factors-executor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spin-factors = { path = "../factors" }
[dev-dependencies]
spin-factor-wasi = { path = "../factor-wasi" }
spin-factors-test = { path = "../factors-test" }
tokio = { version = "1", features = ["macros", "rt"] }
tokio = { workspace = true, features = ["macros", "rt"] }

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/key-value-azure/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ futures = { workspace = true }
serde = { workspace = true }
spin-core = { path = "../core" }
spin-factor-key-value = { path = "../factor-key-value" }
tokio = "1"
tokio = { workspace = true }
url = { workspace = true }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion crates/key-value-redis/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ serde = { workspace = true }
spin-core = { path = "../core" }
spin-factor-key-value = { path = "../factor-key-value" }
spin-world = { path = "../world" }
tokio = "1"
tokio = { workspace = true }
url = { workspace = true }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion crates/key-value-spin/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ serde = { workspace = true }
spin-core = { path = "../core" }
spin-factor-key-value = { path = "../factor-key-value" }
spin-world = { path = "../world" }
tokio = { version = "1", features = ["rt-multi-thread"] }
tokio = { workspace = true, features = ["rt-multi-thread"] }

[lints]
workspace = true
4 changes: 2 additions & 2 deletions crates/llm-local/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ num_cpus = "1"
rand = { workspace = true }
safetensors = "0.4"
serde = { workspace = true }
serde_json = "1"
serde_json = { workspace = true }
spin-common = { path = "../common" }
spin-core = { path = "../core" }
spin-world = { path = "../world" }
terminal = { path = "../terminal" }
tokenizers = "0.20"
tokio = { version = "1", features = ["macros", "sync", "fs"] }
tokio = { workspace = true, features = ["macros", "sync", "fs"] }
tracing = { workspace = true }

[features]
Expand Down
4 changes: 2 additions & 2 deletions crates/loader/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ spin-serde = { path = "../serde" }
tempfile = { workspace = true }
terminal = { path = "../terminal" }
thiserror = { workspace = true }
tokio = "1"
tokio = { workspace = true }
tokio-util = "0.7"
toml = { workspace = true }
tracing = { workspace = true }
walkdir = "2"
wasm-pkg-loader = "0.4"

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

[features]
Expand Down
2 changes: 1 addition & 1 deletion crates/oci/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spin-loader = { path = "../loader" }
spin-locked-app = { path = "../locked-app" }
spin-manifest = { path = "../manifest" }
tempfile = { workspace = true }
tokio = { version = "1", features = ["fs"] }
tokio = { workspace = true, features = ["fs"] }
tokio-util = { version = "0.7", features = ["compat"] }
tracing = { workspace = true }
walkdir = "2"
2 changes: 1 addition & 1 deletion crates/plugins/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ tar = "0.4"
tempfile = { workspace = true }
terminal = { path = "../terminal" }
thiserror = { workspace = true }
tokio = { version = "1", features = ["fs", "process", "rt", "macros"] }
tokio = { workspace = true, features = ["fs", "process", "rt", "macros"] }
tracing = { workspace = true }
url = { version = "2", features = ["serde"] }
2 changes: 1 addition & 1 deletion crates/runtime-config/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ toml = { workspace = true }
[dev-dependencies]
spin-factors-test = { path = "../factors-test" }
spin-world = { path = "../world" }
tokio = { version = "1", features = ["macros"] }
tempfile = "3.2"
tokio = { workspace = true, features = ["macros"] }
toml = "0.8"

[lints]
Expand Down
2 changes: 1 addition & 1 deletion crates/sqlite-inproc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ rand = { workspace = true }
rusqlite = { version = "0.32", features = ["bundled"] }
spin-factor-sqlite = { path = "../factor-sqlite" }
spin-world = { path = "../world" }
tokio = "1"
tokio = { workspace = true }

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/sqlite-libsql/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ rusqlite = { version = "0.32", features = ["bundled"] }
spin-factor-sqlite = { path = "../factor-sqlite" }
spin-world = { path = "../world" }
sqlparser = "0.51"
tokio = { version = "1", features = ["full"] }
tokio = { workspace = true, features = ["full"] }

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/sqlite/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ spin-sqlite-inproc = { path = "../sqlite-inproc" }
spin-sqlite-libsql = { path = "../sqlite-libsql" }
spin-world = { path = "../world" }
table = { path = "../table" }
tokio = "1"
tokio = { workspace = true }
toml = { workspace = true }
2 changes: 1 addition & 1 deletion crates/templates/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ serde = { workspace = true }
spin-common = { path = "../common" }
spin-manifest = { path = "../manifest" }
tempfile = { workspace = true }
tokio = { version = "1", features = ["fs", "process", "rt", "macros"] }
tokio = { workspace = true, features = ["fs", "process", "rt", "macros"] }
toml = { workspace = true }
toml_edit = "0.22"
url = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/trigger-http/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ rustls = { workspace = true }
rustls-pemfile = "2.1.2"
rustls-pki-types = "1.7"
serde = { workspace = true }
serde_json = "1"
serde_json = { workspace = true }
spin-app = { path = "../app" }
spin-core = { path = "../core" }
spin-factor-outbound-http = { path = "../factor-outbound-http" }
Expand All @@ -35,7 +35,7 @@ spin-telemetry = { path = "../telemetry" }
spin-trigger = { path = "../trigger" }
spin-world = { path = "../world" }
terminal = { path = "../terminal" }
tokio = { version = "1", features = ["full"] }
tokio = { workspace = true, features = ["full"] }
tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "tls12"] }
tracing = { workspace = true }
url = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/trigger-redis/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spin-factors = { path = "../factors" }
spin-telemetry = { path = "../telemetry" }
spin-trigger = { path = "../trigger" }
spin-world = { path = "../world" }
tokio = { version = "1", features = ["macros", "rt"] }
tokio = { workspace = true, features = ["macros", "rt"] }
tracing = { workspace = true }

[lints]
Expand Down
Loading

0 comments on commit 543262f

Please sign in to comment.