Skip to content
This repository has been archived by the owner on Oct 19, 2024. It is now read-only.

chore(deps): make tokio required dependency #1322

Merged
merged 3 commits into from
May 29, 2022
Merged

chore(deps): make tokio required dependency #1322

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84b532b
chore(deps): make tokio non optional
mattsse May 28, 2022
e7ab71c
chore(deps): bump tokio 0.18
mattsse May 28, 2022
304642d
Update ethers-providers/Cargo.toml
gakonst May 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 88 additions & 48 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ eyre = "0.6"
rand = "0.8.5"
serde = { version = "1.0.124", features = ["derive"] }
serde_json = "1.0.64"
tokio = { version = "1.5", features = ["macros", "rt-multi-thread"] }
tokio = { version = "1.18", features = ["macros", "rt-multi-thread"] }
hex = "0.4.3"
bytes = "1.1.0"

Expand Down
2 changes: 1 addition & 1 deletion ethers-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ethers-derive-eip712 = { version = "^0.2.0", path = "../ethers-core/ethers-deriv
ethers-solc = { version = "^0.3.0", path = "../ethers-solc", default-features = false }

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
tokio = { version = "1.5", default-features = false, features = ["macros"] }
tokio = { version = "1.18", default-features = false, features = ["macros"] }

[features]
eip712 = ["ethers-derive-eip712", "ethers-core/eip712"]
Expand Down
2 changes: 1 addition & 1 deletion ethers-etherscan/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ semver = "1.0.9"

[dev-dependencies]
tempfile = "3.3.0"
tokio = { version = "1.5", features = ["macros", "rt-multi-thread", "time"] }
tokio = { version = "1.18", features = ["macros", "rt-multi-thread", "time"] }
serial_test = "0.6.0"
tracing-subscriber = { version = "0.3", default-features = false, features = ["env-filter", "fmt"] }

Expand Down
4 changes: 2 additions & 2 deletions ethers-middleware/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ serde_json = { version = "1.0.64", default-features = false }
instant = {version = "0.1.12", features = ["now"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1.5" }
tokio = { version = "1.18" }

[dev-dependencies]
hex = { version = "0.4.3", default-features = false, features = ["std"] }
Expand All @@ -47,7 +47,7 @@ ethers-solc = { version = "^0.3.0", path = "../ethers-solc", default-features =
serial_test = "0.6.0"

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
tokio = { version = "1.5", default-features = false, features = ["rt", "macros", "time"] }
tokio = { version = "1.18", default-features = false, features = ["rt", "macros", "time"] }

[features]
celo = ["ethers-core/celo", "ethers-providers/celo", "ethers-signers/celo", "ethers-contract/celo"]
9 changes: 4 additions & 5 deletions ethers-providers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ hashers = "1.0.1"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
# tokio
tokio-util = { version = "0.7.2", default-features = false, features = ["io"], optional = true }
tokio = { version = "1.5", default-features = false, optional = true }
tokio = { version = "1.5", features = ["time"] }
gakonst marked this conversation as resolved.
Show resolved Hide resolved
tokio-tungstenite = { version = "0.17.1", default-features = false, features = ["connect"], optional = true }

[target.'cfg(target_arch = "wasm32")'.dependencies]
Expand All @@ -58,14 +57,14 @@ wasm-timer = "0.2"
parking_lot = { version = "0.11", features = ["wasm-bindgen"] }

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
tokio = { version = "1.5", default-features = false, features = ["rt", "macros", "time"] }
tokio = { version = "1.18", default-features = false, features = ["rt", "macros", "time"] }
tempfile = "3.3.0"

[features]
default = ["ws", "rustls"]
celo = ["ethers-core/celo"]
ws = ["tokio", "tokio-tungstenite", "futures-channel"]
ipc = ["tokio", "tokio/io-util", "tokio-util", "bytes", "futures-channel"]
ws = ["tokio-tungstenite", "futures-channel"]
ipc = ["tokio/io-util", "bytes", "futures-channel"]

openssl = ["tokio-tungstenite/native-tls", "reqwest/native-tls"]
# we use the webpki roots so we can build static binaries w/o any root cert dependencies
Expand Down
2 changes: 1 addition & 1 deletion ethers-signers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ yubihsm = { version = "0.40.0", features = ["secp256k1", "usb", "mockhsm"] }

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
yubihsm = { version = "0.40.0", features = ["secp256k1", "usb", "mockhsm"] }
tokio = { version = "1.5", default-features = false, features = ["macros", "rt"] }
tokio = { version = "1.18", default-features = false, features = ["macros", "rt"] }
tempfile = "3.3.0"

[features]
Expand Down
4 changes: 2 additions & 2 deletions ethers-solc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ serde_json = "1.0.68"
serde = { version = "1.0.130", features = ["derive"] }
semver = { version = "1.0.9", features = ["serde"] }
walkdir = "2.3.2"
tokio = { version = "1.15.0", default-features = false, features = ["rt"] }
tokio = { version = "1.18", default-features = false, features = ["rt"] }
futures-util = { version = "^0.3", optional = true }
once_cell = "1.12.0"
regex = "1.5.6"
Expand Down Expand Up @@ -59,7 +59,7 @@ tracing-subscriber = {version = "0.3", default-features = false, features = ["en
rand = "0.8.5"
pretty_assertions = "1.2.1"
tempfile = "3.3.0"
tokio = { version = "1.15.0", features = ["full"] }
tokio = { version = "1.18", features = ["full"] }

[[bench]]
name = "compile_many"
Expand Down