From d8c932099ef777758c650da4b4b44eca6a952b6e Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 17 Apr 2024 12:34:09 -0700 Subject: [PATCH] [bzlmod] Set repo_name to com_google_protobuf (#16495) This is currently required by https://github.com/protocolbuffers/protobuf/blob/8d025c08ff9c4e63f37f62b64f3046183ef7ab20/upb_generator/bootstrap_compiler.bzl#L30 We could try to change it but this is fine to do for now Closes #16495 COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/16495 from keith:ks/bzlmod-set-repo_name-to-com_google_protobuf 357776de4a6d9d03c21b5dae642847800b975333 FUTURE_COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/16495 from keith:ks/bzlmod-set-repo_name-to-com_google_protobuf 357776de4a6d9d03c21b5dae642847800b975333 PiperOrigin-RevId: 625771676 --- MODULE.bazel | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 9bab2e3aa9fb4..7cb81223f27ce 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -24,11 +24,5 @@ bazel_dep(name = "rules_python", version = "0.10.2") bazel_dep(name = "platforms", version = "0.0.8") bazel_dep(name = "zlib", version = "1.2.11") -<<<<<<< checkout/google3/third_party/protobuf/github/MODULE.bazel # TODO: remove after toolchain types are moved to protobuf -bazel_dep(name = "rules_proto", version = "4.0.0") -||||||| baseline/google3/third_party/protobuf/github/MODULE.bazel -# TODO: remove after toolchain types are moved to protobuf -bazel_dep(name = "rules_proto", version = "4.0.0")======= -# TODO: remove after toolchain types are moved to protobuf -bazel_dep(name = "rules_proto", version = "4.0.0")>>>>>>> destination/google3/third_party/protobuf/github/MODULE.bazel +bazel_dep(name = "rules_proto", version = "4.0.0") \ No newline at end of file