Skip to content

Commit

Permalink
chore: Upgrade to prost, prost-build and prost-derive 0.6 (#230) (#231)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelbuesing authored and LucioFranco committed Jan 13, 2020
1 parent af807c3 commit dadc818
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ path = "src/uds/server.rs"

[dependencies]
tonic = { path = "../tonic", features = ["tls"] }
prost = { git = "https://github.com/danburkert/prost", branch = "master" }
prost = "0.6"

tokio = { version = "0.2", features = ["rt-threaded", "time", "stream", "fs", "macros", "uds"] }
futures = { version = "0.3", default-features = false, features = ["alloc"]}
Expand All @@ -108,7 +108,7 @@ tracing-attributes = "0.1"
tracing-futures = "0.2"

# Required for wellknown types
prost-types = { git = "https://github.com/danburkert/prost", branch = "master" }
prost-types = "0.6"

[build-dependencies]
tonic-build = { path = "../tonic-build" }
2 changes: 1 addition & 1 deletion examples/helloworld-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ path = "src/client.rs"

[dependencies]
tonic = "0.1.0-beta.1"
prost = { git = "https://github.com/danburkert/prost", branch = "master" }
prost = "0.6"
tokio = { version = "0.2", features = ["macros"] }

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion examples/routeguide-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ Edit `Cargo.toml` and add all the dependencies we'll need for this example:
```toml
[dependencies]
tonic = "0.1.0-beta.1"
prost = { git = "https://github.com/danburkert/prost", branch = "master" }
prost = "0.6"
futures-core = "0.3"
futures-util = "0.3"
tokio = { version = "0.2", features = ["macros", "sync", "stream", "time"] }
Expand Down
4 changes: 2 additions & 2 deletions interop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ path = "src/bin/server.rs"
[dependencies]
tokio = { version = "0.2", features = ["rt-threaded", "time", "macros", "stream", "fs"] }
tonic = { path = "../tonic", features = ["tls"] }
prost = { git = "https://github.com/danburkert/prost", branch = "master" }
prost-derive = { git = "https://github.com/danburkert/prost", branch = "master" }
prost = "0.6"
prost-derive = "0.6"
bytes = "0.5"
http = "0.2"
futures-core = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion tests/included_service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license = "MIT"

[dependencies]
tonic = { path = "../../tonic" }
prost = { git = "https://github.com/danburkert/prost", branch = "master" }
prost = "0.6"

[build-dependencies]
tonic-build = { path = "../../tonic-build" }
2 changes: 1 addition & 1 deletion tests/same_name/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license = "MIT"

[dependencies]
tonic = { path = "../../tonic" }
prost = { git = "https://github.com/danburkert/prost", branch = "master" }
prost = "0.6"

[build-dependencies]
tonic-build = { path = "../../tonic-build" }
4 changes: 2 additions & 2 deletions tests/wellknown/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ license = "MIT"

[dependencies]
tonic = { path = "../../tonic" }
prost = { git = "https://github.com/danburkert/prost", branch = "master" }
prost-types = { git = "https://github.com/danburkert/prost", branch = "master" }
prost = "0.6"
prost-types = "0.6"

[build-dependencies]
tonic-build = { path = "../../tonic-build" }
2 changes: 1 addition & 1 deletion tonic-build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ keywords = ["rpc", "grpc", "async", "codegen", "protobuf"]


[dependencies]
prost-build = { git = "https://github.com/danburkert/prost", branch = "master" }
prost-build = "0.6"
syn = "1.0"
quote = "1.0"
proc-macro2 = "1.0"
Expand Down
4 changes: 2 additions & 2 deletions tonic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ http-body = "0.3"
pin-project = "0.4"

# prost
prost = { git = "https://github.com/danburkert/prost", branch = "master", optional = true }
prost-derive = { git = "https://github.com/danburkert/prost", branch = "master", optional = true }
prost = { version = "0.6", optional = true }
prost-derive = { version = "0.6", optional = true }

# codegen
async-trait = { version = "0.1.13", optional = true }
Expand Down

0 comments on commit dadc818

Please sign in to comment.