Lift dependencies to the workspace (Part 2/x) (#3366)

Lifting some more dependencies to the workspace. Just using the
most-often updated ones for now.
It can be reproduced locally.

```sh
# First you can check if there would be semver incompatible bumps (looks good in this case):
$ zepter transpose dependency lift-to-workspace --ignore-errors syn quote thiserror "regex:^serde.*"

# Then apply the changes:
$ zepter transpose dependency lift-to-workspace --version-resolver=highest syn quote thiserror "regex:^serde.*" --fix

# And format the changes:
$ taplo format --config .config/taplo.toml
```

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
This commit is contained in:
Oliver Tale-Yazdi
2024-02-20 15:28:05 +01:00
committed by GitHub
parent ef6ac94f52
commit e89d0fca35
185 changed files with 283 additions and 274 deletions
+1 -1
View File
@@ -27,7 +27,7 @@ sp-version = { path = "../version", default-features = false }
sp-state-machine = { path = "../state-machine", default-features = false, optional = true }
sp-trie = { path = "../trie", default-features = false, optional = true }
hash-db = { version = "0.16.0", optional = true }
thiserror = { version = "1.0.48", optional = true }
thiserror = { optional = true, workspace = true }
scale-info = { version = "2.10.0", default-features = false, features = [
"derive",
] }
@@ -19,8 +19,8 @@ targets = ["x86_64-unknown-linux-gnu"]
proc-macro = true
[dependencies]
quote = "1.0.28"
syn = { version = "2.0.49", features = ["extra-traits", "fold", "full", "visit"] }
quote = { workspace = true }
syn = { features = ["extra-traits", "fold", "full", "visit"], workspace = true }
proc-macro2 = "1.0.56"
blake2 = { version = "0.10.4", default-features = false }
proc-macro-crate = "3.0.0"
@@ -21,7 +21,7 @@ targets = ["x86_64-unknown-linux-gnu"]
sp-core = { path = "../core", default-features = false }
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", default-features = false, optional = true, features = ["alloc", "derive"] }
serde = { optional = true, features = ["alloc", "derive"], workspace = true }
sp-std = { path = "../std", default-features = false }
sp-io = { path = "../io", default-features = false }
+1 -1
View File
@@ -24,7 +24,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
integer-sqrt = "0.1.2"
num-traits = { version = "0.2.17", default-features = false }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", default-features = false, features = ["alloc", "derive"], optional = true }
serde = { features = ["alloc", "derive"], optional = true, workspace = true }
static_assertions = "1.1.0"
sp-std = { path = "../std", default-features = false }
+1 -1
View File
@@ -22,7 +22,7 @@ futures = "0.3.21"
log = { workspace = true, default-features = true }
parking_lot = "0.12.1"
schnellru = "0.2.1"
thiserror = "1.0.48"
thiserror = { workspace = true }
sp-api = { path = "../api" }
sp-consensus = { path = "../consensus/common" }
sp-database = { path = "../database" }
@@ -19,7 +19,7 @@ targets = ["x86_64-unknown-linux-gnu"]
async-trait = { version = "0.1.74", optional = true }
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", default-features = false, features = ["alloc", "derive"], optional = true }
serde = { features = ["alloc", "derive"], optional = true, workspace = true }
sp-api = { path = "../../api", default-features = false }
sp-application-crypto = { path = "../../application-crypto", default-features = false }
sp-consensus-slots = { path = "../slots", default-features = false }
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", default-features = false, optional = true, features = ["alloc", "derive"] }
serde = { optional = true, features = ["alloc", "derive"], workspace = true }
sp-api = { path = "../../api", default-features = false }
sp-application-crypto = { path = "../../application-crypto", default-features = false }
sp-core = { path = "../../core", default-features = false }
@@ -20,7 +20,7 @@ targets = ["x86_64-unknown-linux-gnu"]
async-trait = "0.1.74"
futures = { version = "0.3.21", features = ["thread-pool"] }
log = { workspace = true, default-features = true }
thiserror = "1.0.48"
thiserror = { workspace = true }
sp-core = { path = "../../core" }
sp-inherents = { path = "../../inherents" }
sp-runtime = { path = "../../runtime" }
@@ -21,7 +21,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
grandpa = { package = "finality-grandpa", version = "0.16.2", default-features = false, features = ["derive-codec"] }
log = { workspace = true }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", features = ["alloc", "derive"], default-features = false, optional = true }
serde = { features = ["alloc", "derive"], optional = true, workspace = true }
sp-api = { path = "../../api", default-features = false }
sp-application-crypto = { path = "../../application-crypto", default-features = false }
sp-core = { path = "../../core", default-features = false }
@@ -20,7 +20,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
scale-codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", default-features = false, features = ["derive"], optional = true }
serde = { features = ["derive"], optional = true, workspace = true }
sp-api = { path = "../../api", default-features = false }
sp-application-crypto = { path = "../../application-crypto", default-features = false, features = ["bandersnatch-experimental"] }
sp-consensus-slots = { path = "../slots", default-features = false }
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0", default-features = false, features = ["alloc", "derive"], optional = true }
serde = { features = ["alloc", "derive"], optional = true, workspace = true }
sp-std = { path = "../../std", default-features = false }
sp-timestamp = { path = "../../timestamp", default-features = false }
+3 -3
View File
@@ -19,7 +19,7 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive", "max-encoded-len"] }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
log = { workspace = true }
serde = { version = "1.0.196", optional = true, default-features = false, features = ["alloc", "derive"] }
serde = { optional = true, features = ["alloc", "derive"], workspace = true }
bounded-collections = { version = "0.2.0", default-features = false }
primitive-types = { version = "0.12.0", default-features = false, features = ["codec", "scale-info"] }
impl-serde = { version = "0.4.0", default-features = false, optional = true }
@@ -39,7 +39,7 @@ sp-storage = { path = "../storage", default-features = false }
sp-externalities = { path = "../externalities", optional = true }
futures = { version = "0.3.21", optional = true }
dyn-clonable = { version = "0.9.0", optional = true }
thiserror = { version = "1.0.48", optional = true }
thiserror = { optional = true, workspace = true }
tracing = { version = "0.1.29", optional = true }
bitflags = "1.3"
paste = "1.0.7"
@@ -63,7 +63,7 @@ bandersnatch_vrfs = { git = "https://github.com/w3f/ring-vrf", rev = "e9782f9",
[dev-dependencies]
criterion = "0.4.0"
serde_json = "1.0.113"
serde_json = { workspace = true, default-features = true }
lazy_static = "1.4.0"
regex = "1.6.0"
@@ -19,6 +19,6 @@ targets = ["x86_64-unknown-linux-gnu"]
proc-macro = true
[dependencies]
quote = "1.0.28"
syn = { version = "2.0.49", features = ["full", "parsing"] }
quote = { workspace = true }
syn = { features = ["full", "parsing"], workspace = true }
sp-crypto-hashing = { path = "..", default-features = false }
+2 -2
View File
@@ -19,8 +19,8 @@ targets = ["x86_64-unknown-linux-gnu"]
proc-macro = true
[dependencies]
quote = "1.0.28"
syn = "2.0.49"
quote = { workspace = true }
syn = { workspace = true }
proc-macro2 = "1.0.56"
[features]
@@ -19,7 +19,7 @@ targets = ["x86_64-unknown-linux-gnu"]
sp-api = { path = "../api", default-features = false }
sp-runtime = { path = "../runtime", default-features = false }
sp-std = { path = "../std", default-features = false }
serde_json = { version = "1.0.113", default-features = false, features = ["alloc", "arbitrary_precision"] }
serde_json = { features = ["alloc", "arbitrary_precision"], workspace = true }
[features]
default = ["std"]
+1 -1
View File
@@ -21,7 +21,7 @@ async-trait = { version = "0.1.74", optional = true }
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
impl-trait-for-tuples = "0.2.2"
thiserror = { version = "1.0.48", optional = true }
thiserror = { optional = true, workspace = true }
sp-runtime = { path = "../runtime", default-features = false, optional = true }
sp-std = { path = "../std", default-features = false }
@@ -14,5 +14,5 @@ readme = "README.md"
workspace = true
[dependencies]
thiserror = "1.0"
thiserror = { workspace = true }
zstd = { version = "0.12.4", default-features = false }
@@ -19,13 +19,13 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
log = { workspace = true }
mmr-lib = { package = "ckb-merkle-mountain-range", version = "0.5.2", default-features = false }
serde = { version = "1.0.196", features = ["alloc", "derive"], default-features = false, optional = true }
serde = { features = ["alloc", "derive"], optional = true, workspace = true }
sp-api = { path = "../api", default-features = false }
sp-core = { path = "../core", default-features = false }
sp-debug-derive = { path = "../debug-derive", default-features = false }
sp-runtime = { path = "../runtime", default-features = false }
sp-std = { path = "../std", default-features = false }
thiserror = { version = "1.0", optional = true }
thiserror = { optional = true, workspace = true }
[dev-dependencies]
array-bytes = "6.1"
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", default-features = false, features = ["alloc", "derive"], optional = true }
serde = { features = ["alloc", "derive"], optional = true, workspace = true }
sp-arithmetic = { path = "../arithmetic", default-features = false }
sp-core = { path = "../core", default-features = false }
sp-runtime = { path = "../runtime", default-features = false }
+2 -2
View File
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
rustc-hash = "1.1.0"
serde = { version = "1.0.196", features = ["derive"] }
serde = { features = ["derive"], workspace = true, default-features = true }
sp-core = { path = "../core" }
[dev-dependencies]
serde_json = "1.0.113"
serde_json = { workspace = true, default-features = true }
@@ -22,6 +22,6 @@ proc-macro = true
Inflector = "0.11.4"
proc-macro-crate = "3.0.0"
proc-macro2 = "1.0.56"
quote = "1.0.28"
quote = { workspace = true }
expander = "2.0.0"
syn = { version = "2.0.49", features = ["extra-traits", "fold", "full", "visit"] }
syn = { features = ["extra-traits", "fold", "full", "visit"], workspace = true }
+2 -2
View File
@@ -25,7 +25,7 @@ log = { workspace = true }
paste = "1.0"
rand = { version = "0.8.5", optional = true }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", default-features = false, features = ["alloc", "derive"], optional = true }
serde = { features = ["alloc", "derive"], optional = true, workspace = true }
sp-application-crypto = { path = "../application-crypto", default-features = false }
sp-arithmetic = { path = "../arithmetic", default-features = false }
sp-core = { path = "../core", default-features = false }
@@ -38,7 +38,7 @@ simple-mermaid = { version = "0.1.1", optional = true }
[dev-dependencies]
rand = "0.8.5"
serde_json = "1.0.113"
serde_json = { workspace = true, default-features = true }
zstd = { version = "0.12.4", default-features = false }
sp-api = { path = "../api" }
sp-state-machine = { path = "../state-machine" }
+1 -1
View File
@@ -16,7 +16,7 @@ workspace = true
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
serde = { version = "1.0.196", default-features = false, features = ["alloc", "derive"], optional = true }
serde = { features = ["alloc", "derive"], optional = true, workspace = true }
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
impl-trait-for-tuples = "0.2.2"
@@ -23,7 +23,7 @@ log = { workspace = true }
parking_lot = { version = "0.12.1", optional = true }
rand = { version = "0.8.5", optional = true }
smallvec = "1.11.0"
thiserror = { version = "1.0.48", optional = true }
thiserror = { optional = true, workspace = true }
tracing = { version = "0.1.29", optional = true }
sp-core = { path = "../core", default-features = false }
sp-externalities = { path = "../externalities", default-features = false }
@@ -26,7 +26,7 @@ sp-api = { path = "../api", default-features = false }
sp-application-crypto = { path = "../application-crypto", default-features = false }
sp-runtime-interface = { path = "../runtime-interface", default-features = false }
sp-externalities = { path = "../externalities", default-features = false }
thiserror = { version = "1.0", optional = true }
thiserror = { optional = true, workspace = true }
# ECIES dependencies
ed25519-dalek = { version = "2.1", optional = true }
+1 -1
View File
@@ -20,7 +20,7 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
impl-serde = { version = "0.4.0", optional = true, default-features = false }
ref-cast = "1.0.0"
serde = { version = "1.0.196", default-features = false, features = ["alloc", "derive"], optional = true }
serde = { features = ["alloc", "derive"], optional = true, workspace = true }
sp-debug-derive = { path = "../debug-derive", default-features = false }
sp-std = { path = "../std", default-features = false }
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", default-features = false, features = ["derive"], optional = true }
serde = { features = ["derive"], optional = true, workspace = true }
sp-application-crypto = { path = "../application-crypto", default-features = false }
sp-core = { path = "../core", default-features = false }
sp-runtime = { path = "../runtime", default-features = false }
+1 -1
View File
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
async-trait = { version = "0.1.74", optional = true }
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.48", optional = true }
thiserror = { optional = true, workspace = true }
sp-inherents = { path = "../inherents", default-features = false }
sp-runtime = { path = "../runtime", default-features = false }
sp-std = { path = "../std", default-features = false }
+1 -1
View File
@@ -30,7 +30,7 @@ nohash-hasher = { version = "0.2.0", optional = true }
parking_lot = { version = "0.12.1", optional = true }
rand = { version = "0.8", optional = true }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
thiserror = { version = "1.0.48", optional = true }
thiserror = { optional = true, workspace = true }
tracing = { version = "0.1.29", optional = true }
trie-db = { version = "0.28.0", default-features = false }
trie-root = { version = "0.18.0", default-features = false }
+2 -2
View File
@@ -21,8 +21,8 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
impl-serde = { version = "0.4.0", default-features = false, optional = true }
parity-wasm = { version = "0.45", optional = true }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", default-features = false, features = ["alloc", "derive"], optional = true }
thiserror = { version = "1.0.48", optional = true }
serde = { features = ["alloc", "derive"], optional = true, workspace = true }
thiserror = { optional = true, workspace = true }
sp-crypto-hashing-proc-macro = { path = "../crypto/hashing/proc-macro" }
sp-runtime = { path = "../runtime", default-features = false }
sp-std = { path = "../std", default-features = false }
@@ -21,8 +21,8 @@ proc-macro = true
[dependencies]
codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
proc-macro2 = "1.0.56"
quote = "1.0.28"
syn = { version = "2.0.49", features = ["extra-traits", "fold", "full", "visit"] }
quote = { workspace = true }
syn = { features = ["extra-traits", "fold", "full", "visit"], workspace = true }
[dev-dependencies]
sp-version = { path = ".." }
+1 -1
View File
@@ -19,7 +19,7 @@ targets = ["x86_64-unknown-linux-gnu"]
bounded-collections = { version = "0.2.0", default-features = false }
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.196", default-features = false, optional = true, features = ["alloc", "derive"] }
serde = { optional = true, features = ["alloc", "derive"], workspace = true }
smallvec = "1.11.0"
sp-arithmetic = { path = "../arithmetic", default-features = false }
sp-debug-derive = { path = "../debug-derive", default-features = false }