Skip to content

Commit a5f7464

Browse files
authored
Update Prost (proto) dependencies to latest versions (#2810)
This change also bumps the min tested Rust version to [Rust 1.72.1](https://github.com/rust-lang/rust/releases/tag/1.72.1) which is about a year old at this point.
1 parent b4ccc97 commit a5f7464

File tree

156 files changed

+5244
-4534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+5244
-4534
lines changed

.bazelci/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ aspects_flags: &aspects_flags
44
- "--config=rustfmt"
55
- "--config=clippy"
66
min_rust_version_shell_commands: &min_rust_version_shell_commands
7-
- sed -i 's|^rust_register_toolchains(|rust_register_toolchains(versions = ["1.68.0"],\n|' WORKSPACE.bazel
7+
- sed -i 's|^rust_register_toolchains(|rust_register_toolchains(versions = ["1.72.1"],\n|' WORKSPACE.bazel
88
nightly_flags: &nightly_flags
99
- "--//rust/toolchain/channel=nightly"
1010
nightly_aspects_flags: &nightly_aspects_flags

MODULE.bazel

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ use_repo(
117117
"rules_rust_bindgen__clap_complete-4.3.1",
118118
"rules_rust_bindgen__env_logger-0.10.0",
119119
"rules_rust_prost",
120-
"rules_rust_prost__h2-0.3.19",
120+
"rules_rust_prost__h2-0.4.6",
121121
"rules_rust_prost__heck",
122-
"rules_rust_prost__prost-0.11.9",
123-
"rules_rust_prost__prost-types-0.11.9",
124-
"rules_rust_prost__protoc-gen-prost-0.2.2",
125-
"rules_rust_prost__protoc-gen-tonic-0.2.2",
126-
"rules_rust_prost__tokio-1.28.2",
127-
"rules_rust_prost__tokio-stream-0.1.14",
128-
"rules_rust_prost__tonic-0.9.2",
122+
"rules_rust_prost__prost-0.13.1",
123+
"rules_rust_prost__prost-types-0.13.1",
124+
"rules_rust_prost__protoc-gen-prost-0.4.0",
125+
"rules_rust_prost__protoc-gen-tonic-0.4.1",
126+
"rules_rust_prost__tokio-1.39.3",
127+
"rules_rust_prost__tokio-stream-0.1.15",
128+
"rules_rust_prost__tonic-0.12.1",
129129
"rules_rust_proto__grpc-0.6.2",
130130
"rules_rust_proto__grpc-compiler-0.6.2",
131131
"rules_rust_proto__log-0.4.17",

examples/bzlmod/proto/MODULE.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,25 +83,25 @@ crate = use_extension("@rules_rust//crate_universe:extension.bzl", "crate")
8383
# protobuf / gRPC dependencies
8484
crate.spec(
8585
package = "prost",
86-
version = "0.12",
86+
version = "0.13.1",
8787
)
8888
crate.spec(
8989
default_features = False,
9090
package = "prost-types",
91-
version = "0.12",
91+
version = "0.13.1",
9292
)
9393
crate.spec(
9494
features = ["transport"],
9595
package = "tonic",
96-
version = "0.11",
96+
version = "0.12.1",
9797
)
9898
crate.spec(
9999
package = "tonic-build",
100-
version = "0.11",
100+
version = "0.12.1",
101101
)
102102
crate.spec(
103103
package = "protoc-gen-prost",
104-
version = "0.3.1",
104+
version = "0.4.0",
105105
)
106106
crate.annotation(
107107
crate = "protoc-gen-prost",
@@ -127,7 +127,7 @@ crate.spec(
127127
"signal",
128128
],
129129
package = "tokio",
130-
version = "1.38",
130+
version = "1.39.3",
131131
)
132132
crate.from_specs()
133133
use_repo(crate, "crates")

examples/bzlmod/proto_with_toolchain/MODULE.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,25 +83,25 @@ crate = use_extension("@rules_rust//crate_universe:extension.bzl", "crate")
8383
# protobuf / gRPC dependencies
8484
crate.spec(
8585
package = "prost",
86-
version = "0.12",
86+
version = "0.13.1",
8787
)
8888
crate.spec(
8989
default_features = False,
9090
package = "prost-types",
91-
version = "0.12",
91+
version = "0.13.1",
9292
)
9393
crate.spec(
9494
features = ["transport"],
9595
package = "tonic",
96-
version = "0.11",
96+
version = "0.12.1",
9797
)
9898
crate.spec(
9999
package = "tonic-build",
100-
version = "0.11",
100+
version = "0.12.1",
101101
)
102102
crate.spec(
103103
package = "protoc-gen-prost",
104-
version = "0.3.1",
104+
version = "0.4.0",
105105
)
106106
crate.annotation(
107107
crate = "protoc-gen-prost",

proto/prost/private/3rdparty/BUILD.bazel

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@ crates_vendor(
66
annotations = {
77
"protoc-gen-prost": [crate.annotation(
88
gen_binaries = ["protoc-gen-prost"],
9-
patch_args = [
10-
"-p1",
11-
],
12-
patches = [
13-
# This patch is needed to handle duplicate package names.
14-
# See: https://github.com/neoeinstein/protoc-gen-prost/issues/70
15-
"@rules_rust//proto/prost/private/3rdparty/patches:protoc-gen-prost.patch",
16-
],
179
)],
1810
"protoc-gen-tonic": [crate.annotation(
1911
gen_binaries = ["protoc-gen-tonic"],
@@ -23,29 +15,29 @@ crates_vendor(
2315
mode = "remote",
2416
packages = {
2517
"h2": crate.spec(
26-
version = "0.3.19",
18+
version = "0.4.6",
2719
),
2820
"prost": crate.spec(
29-
version = "0.11.9",
21+
version = "0.13.1",
3022
),
3123
"prost-types": crate.spec(
32-
version = "0.11.9",
24+
version = "0.13.1",
3325
),
3426
"protoc-gen-prost": crate.spec(
35-
version = "0.2.2",
27+
version = "0.4.0",
3628
),
3729
"protoc-gen-tonic": crate.spec(
38-
version = "0.2.2",
30+
version = "0.4.0",
3931
),
4032
"tokio": crate.spec(
4133
features = ["full"],
42-
version = "1.28.2",
34+
version = "1.39.3",
4335
),
4436
"tokio-stream": crate.spec(
45-
version = "0.1.14",
37+
version = "0.1.15",
4638
),
4739
"tonic": crate.spec(
48-
version = "0.9.2",
40+
version = "0.12.1",
4941
),
5042
},
5143
repository_name = "rules_rust_prost",

proto/prost/private/3rdparty/BUILD.heck.bazel

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)