Skip to content

Commit 9bb3ee6

Browse files
copybara-androidxtestcopybara-androidxtest
committed
Upgrade protobuf to 28.3 and add proto rules loads
Upgrade protobuf to 28.3, this version has loads. Call py_repositories, that's needed by protobuf. Remove rules_proto, they've been deprecated. Add @com_google_protobuf//java/core:lite to _SHADED_TARGETS. Protobuf has an alias pointing to that target. It can't be used directly though, because it's private. Upgrade Bazel version to 6.5.0. Without that protobuf doesn't compile. PiperOrigin-RevId: 696176142
1 parent 8047902 commit 9bb3ee6

File tree

16 files changed

+41
-11
lines changed

16 files changed

+41
-11
lines changed

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.3.0
1+
6.5.0

‎WORKSPACE‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,19 @@ http_archive(
2828
url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
2929
)
3030

31-
# rules_proto defines proto_library, as well as @com_google_protobuf_javalite
31+
# protobuf defines proto_library, as well as @com_google_protobuf_javalite
3232
http_archive(
33-
name = "rules_proto",
34-
sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
35-
strip_prefix = "rules_proto-5.3.0-21.7",
36-
urls = [
37-
"https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz",
38-
],
33+
name = "com_google_protobuf",
34+
sha256 = "7c3ebd7aaedd86fa5dc479a0fda803f602caaf78d8aff7ce83b89e1b8ae7442a",
35+
strip_prefix = "protobuf-28.3",
36+
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v28.3/protobuf-28.3.tar.gz"],
3937
)
40-
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
41-
rules_proto_dependencies()
42-
rules_proto_toolchains()
38+
39+
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
40+
protobuf_deps()
41+
42+
load("@rules_python//python:repositories.bzl", "py_repositories")
43+
py_repositories()
4344

4445
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4546

‎build_extensions/maven/maven_registry.bzl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ _TARGET_TO_MAVEN_ARTIFACT = {
4949

5050
_SHADED_TARGETS = [
5151
"@com_google_protobuf//:protobuf_javalite",
52+
"@com_google_protobuf//java/core:lite",
5253
"//opensource/proto:any_java_proto_lite",
5354
"@com_google_protobuf//:any_proto",
5455
"//opensource/dagger:dagger",

‎espresso/remote/java/androidx/test/espresso/proto/BUILD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Protocol buffer definitions for remote UI interactions
22

3+
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
4+
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
35
load("@rules_java//java:defs.bzl", "java_library")
46

57
licenses(["notice"])

‎espresso/remote/java/androidx/test/espresso/proto/action/BUILD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Protocol buffer definitions for remote UI interactions view matchers
22

3+
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
4+
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
35
load("@rules_java//java:defs.bzl", "java_library")
46

57
licenses(["notice"])

‎espresso/remote/java/androidx/test/espresso/proto/assertion/BUILD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Protocol buffer definitions for remote view assertions
22

3+
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
4+
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
35
load("@rules_java//java:defs.bzl", "java_library")
46

57
licenses(["notice"])

‎espresso/remote/java/androidx/test/espresso/proto/matcher/BUILD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Protocol buffer definitions for remote root, view and hamcrest matchers (v1.3)
22

3+
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
4+
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
35
load("@rules_java//java:defs.bzl", "java_library")
46

57
licenses(["notice"])

‎espresso/remote/java/androidx/test/espresso/web/proto/action/BUILD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Protocol buffer definitions for remote web actions
22

3+
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
4+
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
35
load("@rules_java//java:defs.bzl", "java_library")
46

57
licenses(["notice"])

‎espresso/remote/java/androidx/test/espresso/web/proto/assertion/BUILD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Protocol buffer definitions for remote web assertions
22

3+
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
4+
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
35
load("@rules_java//java:defs.bzl", "java_library")
46

57
licenses(["notice"])

‎espresso/remote/java/androidx/test/espresso/web/proto/matcher/BUILD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Protocol buffer definitions for remote web matchers
22

3+
load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
4+
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
35
load("@rules_java//java:defs.bzl", "java_library")
46

57
licenses(["notice"])

0 commit comments

Comments
 (0)