Skip to content

Commit 7a25e68

Browse files
committedJul 24, 2024·
bazel: Use com_google_protobuf instead of com_google_protobuf_javalite
Since Bazel 6 [1], Bazel has used com_google_protobuf for javalite. We only used the other repo because Bazel expected it, which was because Protobuf split out javalite to a separate branch for a while. Since everything is now reunified, we can use a singular protobuf repo. 1. bazelbuild/bazel@abdb1d6
1 parent 5ec0187 commit 7a25e68

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed
 

Diff for: ‎MODULE.bazel

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ use_repo(
6262
non_module_deps,
6363
"com_github_cncf_xds",
6464
"envoy_api",
65-
"com_google_protobuf_javalite",
6665
)
6766

6867
grpc_repo_deps_ext = use_extension("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_repo_deps_ext")

Diff for: ‎repositories.bzl

+1-12
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
6262
IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS = {
6363
"com.google.protobuf:protobuf-java": "@com_google_protobuf//:protobuf_java",
6464
"com.google.protobuf:protobuf-java-util": "@com_google_protobuf//:protobuf_java_util",
65-
"com.google.protobuf:protobuf-javalite": "@com_google_protobuf_javalite//:protobuf_javalite",
65+
"com.google.protobuf:protobuf-javalite": "@com_google_protobuf//:protobuf_javalite",
6666
"io.grpc:grpc-alts": "@io_grpc_grpc_java//alts",
6767
"io.grpc:grpc-api": "@io_grpc_grpc_java//api",
6868
"io.grpc:grpc-auth": "@io_grpc_grpc_java//auth",
@@ -107,8 +107,6 @@ def grpc_java_repositories(bzlmod = False):
107107
)
108108
if not bzlmod and not native.existing_rule("com_google_protobuf"):
109109
com_google_protobuf()
110-
if not native.existing_rule("com_google_protobuf_javalite"):
111-
com_google_protobuf_javalite()
112110
if not bzlmod and not native.existing_rule("com_google_googleapis"):
113111
http_archive(
114112
name = "com_google_googleapis",
@@ -153,15 +151,6 @@ def com_google_protobuf():
153151
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz"],
154152
)
155153

156-
def com_google_protobuf_javalite():
157-
# java_lite_proto_library rules implicitly depend on @com_google_protobuf_javalite
158-
http_archive(
159-
name = "com_google_protobuf_javalite",
160-
sha256 = "9bd87b8280ef720d3240514f884e56a712f2218f0d693b48050c836028940a42",
161-
strip_prefix = "protobuf-25.1",
162-
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz"],
163-
)
164-
165154
def io_grpc_grpc_proto():
166155
http_archive(
167156
name = "io_grpc_grpc_proto",

0 commit comments

Comments
 (0)
Please sign in to comment.