Skip to content

Commit

Permalink
Merge #23
Browse files Browse the repository at this point in the history
23: chore(deps): Update prost, tonic and pbjson dependencies. r=neoeinstein a=o-agassizii

tonic 0.8.0 was recently released. Said version of tonic depends on an updated version of prost. Likewise, pbjson has recently been updated upstream to depend on the latest version of prost.

See also:

* hyperium/tonic#1004
* #6 (referenced in the above link)

Co-authored-by: Opisthoteuthis agassizii <[email protected]>
  • Loading branch information
bors[bot] and o-agassizii authored Aug 8, 2022
2 parents 946c6db + 47a4a1a commit 9b5a6ab
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 51 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ jobs:
with:
github_token: ${{ github.token }}
- uses: Swatinem/[email protected]
- name: Install protobuf compiler and protobuf resources
run: sudo apt install protobuf-compiler libprotobuf-dev
- name: Generate greeter
run: |
export PATH=$GITHUB_WORKSPACE/bin:$PATH
Expand Down Expand Up @@ -141,6 +143,8 @@ jobs:
with:
github_token: ${{ github.token }}
- uses: Swatinem/[email protected]
- name: Install protobuf compiler and protobuf resources
run: sudo apt install protobuf-compiler libprotobuf-dev
- name: Generate example
run: |
export PATH=$GITHUB_WORKSPACE/bin:$PATH
Expand Down
41 changes: 12 additions & 29 deletions Cargo.lock

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

10 changes: 5 additions & 5 deletions example/build-with-buf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ default = ["proto_full"]
# This section is automatically generated by protoc-gen-prost-crate.
# Changes in this area may be lost on regeneration.
proto_full = ["example"]
example = []
"example" = []
# @@protoc_insertion_point(features)

[dependencies]
bytes = "1.1.0"
prost = "0.10.0"
pbjson = "0.3"
pbjson-types = "0.3"
prost = "0.11.0"
pbjson = "0.4"
pbjson-types = "0.4"
serde = "1.0"
tonic = { version = "0.7", features = ["compression"] }
tonic = { version = "0.8", features = ["gzip"] }

[workspace]
6 changes: 3 additions & 3 deletions proto/Cargo.toml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ version = "0.1.0"
edition = "2021"

[dependencies]
prost = "0.10.0"
pbjson-types = "0.3"
prost = "0.11.0"
pbjson-types = "0.4"
serde = "1.0"
tonic = { version = "0.7", features = ["compression"] }
tonic = { version = "0.8", features = ["gzip"] }

[features]
default = []
Expand Down
6 changes: 3 additions & 3 deletions protoc-gen-prost-crate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ categories = ["encoding"]

[dependencies]
once_cell = "1.10.0"
prost-build = { version = "0.10.0", default-features = false }
prost-types = { version = "0.10.0", default-features = false }
prost = { version = "0.10.0", default-features = false, features = ["std"] }
prost-build = { version = "0.11.0", default-features = false }
prost-types = { version = "0.11.0", default-features = false }
prost = { version = "0.11.0", default-features = false, features = ["std"] }
protoc-gen-prost = { version = "0.1.4", path = "../protoc-gen-prost" }
regex = { version = "1.5.5", default-features = false }

Expand Down
8 changes: 4 additions & 4 deletions protoc-gen-prost-serde/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ categories = ["encoding"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
pbjson-build = "0.3.0"
prost-build = { version = "0.10.0", default-features = false }
prost-types = { version = "0.10.0", default-features = false }
prost = { version = "0.10.0", default-features = false, features = ["std"] }
pbjson-build = "0.4.0"
prost-build = { version = "0.11.0", default-features = false }
prost-types = { version = "0.11.0", default-features = false }
prost = { version = "0.11.0", default-features = false, features = ["std"] }
protoc-gen-prost = { version = "0.1.4", path = "../protoc-gen-prost" }
regex = { version = "1.5.5", default-features = false }

Expand Down
6 changes: 3 additions & 3 deletions protoc-gen-prost/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ exclude = [

[dependencies]
once_cell = "1.10.0"
prost-build = { version = "0.10.0", default-features = false }
prost-types = { version = "0.10.0", default-features = false }
prost = { version = "0.10.0", default-features = false, features = ["std"] }
prost-build = { version = "0.11.0", default-features = false }
prost-types = { version = "0.11.0", default-features = false }
prost = { version = "0.11.0", default-features = false, features = ["std"] }
regex = { version = "1.5.5", default-features = false }

[profile.release]
Expand Down
8 changes: 4 additions & 4 deletions protoc-gen-tonic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ exclude = [
[dependencies]
heck = "0.4.0"
prettyplease = "0.1.9"
prost-build = { version = "0.10.0", default-features = false }
prost-types = { version = "0.10.0", default-features = false }
prost = { version = "0.10.0", default-features = false, features = ["std"] }
prost-build = { version = "0.11.0", default-features = false }
prost-types = { version = "0.11.0", default-features = false }
prost = { version = "0.11.0", default-features = false, features = ["std"] }
protoc-gen-prost = { version = "0.1.4", path = "../protoc-gen-prost" }
regex = { version = "1.5.5", default-features = false }
syn = { version = "1.0.89", features = ["parsing", "full"] }
tonic-build = { version = "0.7", features = ["compression"] }
tonic-build = { version = "0.8", features = [] }

[profile.release]
codegen-units = 1
Expand Down

0 comments on commit 9b5a6ab

Please sign in to comment.