From 9c686a2c5cde44332eb86b535a0ebed5fdaff35c Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 17 Apr 2024 13:20:58 -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 PiperOrigin-RevId: 625786077 --- MODULE.bazel | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index d900a52f34..9bab2e3aa9 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,18 +1,19 @@ # TODO: migrate all dependencies from WORKSPACE to MODULE.bazel # https://github.com/protocolbuffers/protobuf/issues/14313 -PROTOBUF_VERSION = "27.0" +PROTOBUF_VERSION = "27.0" module( name = "protobuf", - compatibility_level = 1, version = PROTOBUF_VERSION, + compatibility_level = 1, + repo_name = "com_google_protobuf", ) # LOWER BOUND dependency versions. # Bzlmod follows MVS: # https://bazel.build/versions/6.0.0/build/bzlmod#version-resolution # Thus the highest version in their module graph is resolved. -bazel_dep(name = "abseil-cpp", repo_name = "com_google_absl", version = "20230802.0.bcr.1") +bazel_dep(name = "abseil-cpp", version = "20230802.0.bcr.1", repo_name = "com_google_absl") bazel_dep(name = "bazel_skylib", version = "1.4.1") bazel_dep(name = "jsoncpp", version = "1.9.5") bazel_dep(name = "rules_cc", version = "0.0.9") @@ -23,5 +24,11 @@ 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") \ No newline at end of file +bazel_dep(name = "rules_proto", version = "4.0.0")>>>>>>> destination/google3/third_party/protobuf/github/MODULE.bazel