Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ aspects_flags: &aspects_flags
- "--config=rustfmt"
- "--config=clippy"
min_rust_version_shell_commands: &min_rust_version_shell_commands
- sed -i 's|^rust_register_toolchains(|rust_register_toolchains(versions = ["1.68.0"],\n|' WORKSPACE.bazel
- sed -i 's|^rust_register_toolchains(|rust_register_toolchains(versions = ["1.72.1"],\n|' WORKSPACE.bazel
nightly_flags: &nightly_flags
- "--//rust/toolchain/channel=nightly"
nightly_aspects_flags: &nightly_aspects_flags
Expand Down
16 changes: 8 additions & 8 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,15 @@ use_repo(
"rules_rust_bindgen__clap_complete-4.3.1",
"rules_rust_bindgen__env_logger-0.10.0",
"rules_rust_prost",
"rules_rust_prost__h2-0.3.19",
"rules_rust_prost__h2-0.4.6",
"rules_rust_prost__heck",
"rules_rust_prost__prost-0.11.9",
"rules_rust_prost__prost-types-0.11.9",
"rules_rust_prost__protoc-gen-prost-0.2.2",
"rules_rust_prost__protoc-gen-tonic-0.2.2",
"rules_rust_prost__tokio-1.28.2",
"rules_rust_prost__tokio-stream-0.1.14",
"rules_rust_prost__tonic-0.9.2",
"rules_rust_prost__prost-0.13.1",
"rules_rust_prost__prost-types-0.13.1",
"rules_rust_prost__protoc-gen-prost-0.4.0",
"rules_rust_prost__protoc-gen-tonic-0.4.1",
"rules_rust_prost__tokio-1.39.3",
"rules_rust_prost__tokio-stream-0.1.15",
"rules_rust_prost__tonic-0.12.1",
"rules_rust_proto__grpc-0.6.2",
"rules_rust_proto__grpc-compiler-0.6.2",
"rules_rust_proto__log-0.4.17",
Expand Down
12 changes: 6 additions & 6 deletions examples/bzlmod/proto/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -83,25 +83,25 @@ crate = use_extension("@rules_rust//crate_universe:extension.bzl", "crate")
# protobuf / gRPC dependencies
crate.spec(
package = "prost",
version = "0.12",
version = "0.13.1",
)
crate.spec(
default_features = False,
package = "prost-types",
version = "0.12",
version = "0.13.1",
)
crate.spec(
features = ["transport"],
package = "tonic",
version = "0.11",
version = "0.12.1",
)
crate.spec(
package = "tonic-build",
version = "0.11",
version = "0.12.1",
)
crate.spec(
package = "protoc-gen-prost",
version = "0.3.1",
version = "0.4.0",
)
crate.annotation(
crate = "protoc-gen-prost",
Expand All @@ -127,7 +127,7 @@ crate.spec(
"signal",
],
package = "tokio",
version = "1.38",
version = "1.39.3",
)
crate.from_specs()
use_repo(crate, "crates")
10 changes: 5 additions & 5 deletions examples/bzlmod/proto_with_toolchain/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -83,25 +83,25 @@ crate = use_extension("@rules_rust//crate_universe:extension.bzl", "crate")
# protobuf / gRPC dependencies
crate.spec(
package = "prost",
version = "0.12",
version = "0.13.1",
)
crate.spec(
default_features = False,
package = "prost-types",
version = "0.12",
version = "0.13.1",
)
crate.spec(
features = ["transport"],
package = "tonic",
version = "0.11",
version = "0.12.1",
)
crate.spec(
package = "tonic-build",
version = "0.11",
version = "0.12.1",
)
crate.spec(
package = "protoc-gen-prost",
version = "0.3.1",
version = "0.4.0",
)
crate.annotation(
crate = "protoc-gen-prost",
Expand Down
24 changes: 8 additions & 16 deletions proto/prost/private/3rdparty/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@ crates_vendor(
annotations = {
"protoc-gen-prost": [crate.annotation(
gen_binaries = ["protoc-gen-prost"],
patch_args = [
"-p1",
],
patches = [
# This patch is needed to handle duplicate package names.
# See: https://github.com/neoeinstein/protoc-gen-prost/issues/70
"@rules_rust//proto/prost/private/3rdparty/patches:protoc-gen-prost.patch",
],
)],
"protoc-gen-tonic": [crate.annotation(
gen_binaries = ["protoc-gen-tonic"],
Expand All @@ -23,29 +15,29 @@ crates_vendor(
mode = "remote",
packages = {
"h2": crate.spec(
version = "0.3.19",
version = "0.4.6",
),
"prost": crate.spec(
version = "0.11.9",
version = "0.13.1",
),
"prost-types": crate.spec(
version = "0.11.9",
version = "0.13.1",
),
"protoc-gen-prost": crate.spec(
version = "0.2.2",
version = "0.4.0",
),
"protoc-gen-tonic": crate.spec(
version = "0.2.2",
version = "0.4.0",
),
"tokio": crate.spec(
features = ["full"],
version = "1.28.2",
version = "1.39.3",
),
"tokio-stream": crate.spec(
version = "0.1.14",
version = "0.1.15",
),
"tonic": crate.spec(
version = "0.9.2",
version = "0.12.1",
),
},
repository_name = "rules_rust_prost",
Expand Down
20 changes: 0 additions & 20 deletions proto/prost/private/3rdparty/BUILD.heck.bazel

This file was deleted.

Loading
Loading