Skip to content

Commit

Permalink
Update protobuf dependencies (#493)
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronmondal committed Dec 15, 2023
1 parent 96302cb commit 3dacdad
Show file tree
Hide file tree
Showing 19 changed files with 457 additions and 381 deletions.
340 changes: 194 additions & 146 deletions Cargo.Bazel.lock

Large diffs are not rendered by default.

82 changes: 47 additions & 35 deletions Cargo.lock

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
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ scopeguard = "1.2.0"
serde_json5 = "0.1.0"
tokio = { version = "1.35.0", features = ["rt-multi-thread", "signal"] }
tokio-rustls = "0.24.1"
tonic = { version = "0.9.2", features = ["gzip"] }
tonic = { version = "0.10.2", features = ["gzip"] }
tower = "0.4.13"
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
17 changes: 3 additions & 14 deletions WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -75,24 +75,13 @@ crate_repositories()

http_archive(
name = "com_google_protobuf",
sha256 = "a700a49470d301f1190a487a923b5095bf60f08f4ae4cac9f5f7c36883d17971",
strip_prefix = "protobuf-23.4",
sha256 = "9bd87b8280ef720d3240514f884e56a712f2218f0d693b48050c836028940a42",
strip_prefix = "protobuf-25.1",
urls = [
"https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protobuf-23.4.tar.gz",
"https://github.com/protocolbuffers/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz",
],
)

load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

# The version of utf8_range provided by com_google_protobuf raises warnings
# which have been cleaned up in this slightly newer commit.
http_archive(
name = "utf8_range",
sha256 = "568988b5f7261ca181468dba38849fabf59dd9200fb2ed4b2823da187ef84d8c",
strip_prefix = "utf8_range-d863bc33e15cba6d873c878dcca9e6fe52b2f8cb",
urls = [
"https://github.com/protocolbuffers/utf8_range/archive/d863bc33e15cba6d873c878dcca9e6fe52b2f8cb.zip",
],
)

protobuf_deps()
6 changes: 3 additions & 3 deletions nativelink-error/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ autobenches = false
nativelink-proto = { path = "../nativelink-proto" }

hex = "0.4.3"
prost = "0.11.9"
prost-types = "0.11.9"
prost = "0.12.3"
prost-types = "0.12.3"
tokio = { version = "1.35.0" }
tonic = { version = "0.9.2", features = ["gzip"] }
tonic = { version = "0.10.2", features = ["gzip"] }
10 changes: 5 additions & 5 deletions nativelink-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ path = "genproto/lib.rs"
doctest = false

[dependencies]
prost = "0.11.9"
prost-types = "0.11.9"
tonic = { version = "0.9.2", features = ["gzip"] }
prost = "0.12.3"
prost-types = "0.12.3"
tonic = { version = "0.10.2", features = ["gzip"] }

[dev-dependencies]
prost-build = "0.11.9"
tonic-build = "0.9.2"
prost-build = "0.12.3"
tonic-build = "0.10.2"
Loading

0 comments on commit 3dacdad

Please sign in to comment.