zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move all git dependencies to published crates. (#58) 

The earlier issues with version resolution incompatibilities are now
resolved, and all the upstream changes we made to tracing are released.
This commit is contained in:
Henry de Valence 2019-10-08 21:10:01 -07:00 committed by Deirdre Connolly
parent 6f79f2843d
commit 8a3b4f48fc
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml
View File

@ -9,8 +9,4 @@ members = [
"zebra-client",
"zebra-reactor",
"zebrad",
]
[patch.crates-io]
tracing-attributes = { git = "https://github.com/tokio-rs/tracing" }
tracing = { git = "https://github.com/tokio-rs/tracing" }
]

8
zebra-network/Cargo.toml
View File

@ -15,11 +15,13 @@ byteorder = "1.3"
chrono = "0.4"
failure = "0.1"
serde = { version = "1", features = ["serde_derive"] }
tokio = "=0.2.0-alpha.6"
tower = { git = "https://github.com/tower-rs/tower", branch = "v0.3.x" }
tracing = { git = "https://github.com/tokio-rs/tracing" }
tracing-futures = { git = "https://github.com/tokio-rs/tracing", features = ["tokio-alpha"], default-features = false }
futures-preview = { version = "=0.3.0-alpha.19", features = ["async-await"] }
tracing = "0.1"
tracing-futures = { version = "0.1", features = ["tokio-alpha"], default-features = false }
tower = "=0.3.0-alpha.2"
zebra-chain = { path = "../zebra-chain" }

18
zebrad/Cargo.toml
View File

@ -13,17 +13,19 @@ gumdrop = "0.6"
lazy_static = "1"
serde = { version = "1", features = ["serde_derive"] }
toml = "0.5"
tokio = "=0.2.0-alpha.6"
# Replace with git to pick up instrument derive changes, revert on release.
#tracing = "0.1"
tracing = { git = "https://github.com/tokio-rs/tracing" }
tracing-futures = { git = "https://github.com/tokio-rs/tracing", features = ["tokio-alpha"], default-features = false }
tracing-subscriber = { git = "https://github.com/tokio-rs/tracing" }
tracing-log = { git = "https://github.com/tokio-rs/tracing" }
hyper = { git = "https://github.com/hyperium/hyper"}
tower = { git = "https://github.com/tower-rs/tower", branch = "v0.3.x" }
futures-preview = { version = "=0.3.0-alpha.19", features = ["async-await"] }
tracing = "0.1"
tracing-futures = { version = "0.1", features = ["tokio-alpha"], default-features = false }
tracing-subscriber = "0.1"
tracing-log = "0.1"
hyper = "=0.13.0-alpha.4"
tower = "=0.3.0-alpha.2"
zebra-chain = { path = "../zebra-chain" }
zebra-network = { path = "../zebra-network" }