Skip to content

Commit

Permalink
Upgrade protobuf and load proto_library and lang_proto_library from it (
Browse files Browse the repository at this point in the history
#6862)

* Upgrade everything! [

(cherry picked from commit 19aa952)

* Rename com_google_protobuf to protobuf

(cherry picked from commit b220447)

* Fix for recent protobuf dep

* Change rules_proto loads to protobuf

(cherry picked from commit 65c4b02)

* Replace lang_proto_libraries with loads from protobuf

(cherry picked from commit ffe44b6)

* fix

---------

Co-authored-by: Xdng Yng <wyverald@gmail.com>
Co-authored-by: Googler <intellij-github@google.com>
  • Loading branch information
3 people authored Oct 9, 2024
1 parent ea47578 commit 0bdafa1
Show file tree
Hide file tree
Showing 14 changed files with 885 additions and 120 deletions.
3 changes: 1 addition & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ bazel_dep(
)
bazel_dep(
name = "protobuf",
version = "28.2",
repo_name = "com_google_protobuf",
version = "29.0-rc1",
)
bazel_dep(
name = "bazel_skylib",
Expand Down
88 changes: 7 additions & 81 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions aspect/testing/rules/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ java_binary(
":intellij_aspect_test_fixture_java_proto",
"//aspect/testing:guava",
"//proto:intellij_ide_info_java_proto",
"@com_google_protobuf//:protobuf_java",
"@protobuf//:protobuf_java",
],
)

Expand Down Expand Up @@ -72,7 +72,7 @@ java_binary(
":fast_build_aspect_test_fixture_java_proto",
"//aspect/testing:guava",
"//proto:fast_build_info_java_proto",
"@com_google_protobuf//:protobuf_java",
"@protobuf//:protobuf_java",
],
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
load("@protobuf//bazel:proto_library.bzl", "proto_library")

load(
"//aspect/testing/rules:intellij_aspect_test_fixture.bzl",
"intellij_aspect_test_fixture",
Expand All @@ -10,7 +11,7 @@ proto_library(
name = "fooproto_proto",
srcs = ["fooserver.proto"],
visibility = ["//visibility:public"],
deps = ["@com_google_protobuf//:empty_proto"],
deps = ["@protobuf//:empty_proto"],
)

go_proto_library(
Expand Down
Loading

0 comments on commit 0bdafa1

Please sign in to comment.