Skip to content

Commit 2711321

Browse files
committed
Load Protocol Buffer rules from protobuf repository.
The rules in rules_proto and rules_python are deprecated.
1 parent 96fddab commit 2711321

File tree

10 files changed

+13
-27
lines changed

10 files changed

+13
-27
lines changed

MODULE.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ bazel_dep(name = "platforms", version = "0.0.10")
2121
bazel_dep(name = "bazel_skylib", version = "1.7.0")
2222
bazel_dep(name = "bazel_features", version = "1.13.0")
2323
bazel_dep(name = "rules_license", version = "1.0.0")
24-
bazel_dep(name = "rules_proto", version = "6.0.0")
2524
bazel_dep(name = "rules_python", version = "0.36.0")
2625
bazel_dep(name = "abseil-cpp", version = "20240116.2", repo_name = "com_google_absl")
2726
bazel_dep(name = "protobuf", version = "28.1", repo_name = "com_google_protobuf")

MODULE.bazel.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

WORKSPACE

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,6 @@ load("@pip_deps//:requirements.bzl", "install_deps")
6868

6969
install_deps()
7070

71-
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
72-
73-
rules_proto_dependencies()
74-
75-
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
76-
77-
rules_proto_toolchains()
78-
7971
load("@rules_license//:deps.bzl", "rules_license_dependencies")
8072

8173
# This must come after the rules_python repository because rules_license

docs/BUILD

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1516
load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc")
1617
load("@pip_deps//:requirements.bzl", "requirement")
1718
load("@rules_python//python:defs.bzl", "py_binary")
18-
load("@rules_python//python:proto.bzl", "py_proto_library")
1919
load("//elisp:defs.bzl", "elisp_binary", "elisp_manual")
2020
load("//private:defs.bzl", "PACKAGE_FEATURES", "STARDOC_TAGS", "merged_manual")
2121

@@ -79,7 +79,8 @@ stardoc(
7979
"@bazel_features//:features",
8080
"@bazel_skylib//lib:collections",
8181
"@bazel_skylib//lib:paths",
82-
"@rules_proto//proto:defs",
82+
"@com_google_protobuf//bazel/common:proto_common_bzl",
83+
"@com_google_protobuf//bazel/common:proto_info_bzl",
8384
],
8485
)
8586

elisp/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ bzl_library(
114114
"@bazel_features//:features",
115115
"@bazel_skylib//lib:collections",
116116
"@bazel_skylib//lib:paths",
117-
"@rules_proto//proto:defs",
117+
"@com_google_protobuf//bazel/common:proto_common_bzl",
118+
"@com_google_protobuf//bazel/common:proto_info_bzl",
118119
],
119120
)
120121

elisp/defs.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ load("@bazel_features//:features.bzl", "bazel_features")
1818
load("@bazel_skylib//lib:collections.bzl", "collections")
1919
load("@bazel_skylib//lib:paths.bzl", "paths")
2020
load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
21-
load("@rules_proto//proto:defs.bzl", "ProtoInfo", "proto_common")
21+
load("@com_google_protobuf//bazel/common:proto_common.bzl", "proto_common")
22+
load("@com_google_protobuf//bazel/common:proto_info.bzl", "ProtoInfo")
2223
load(
2324
"//private:defs.bzl",
2425
"CcDefaultInfo",

elisp/proto/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
# limitations under the License.
1414

1515
load("@bazel_skylib//lib:shell.bzl", "shell")
16+
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
1617
load("@com_google_protobuf//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library")
17-
load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
18+
load("@com_google_protobuf//bazel/toolchains:proto_lang_toolchain.bzl", "proto_lang_toolchain")
1819
load("@rules_python//python:defs.bzl", "py_test")
1920
load("//elisp:defs.bzl", "elisp_binary", "elisp_cc_module", "elisp_library", "elisp_proto_library", "elisp_test")
2021
load("//private:defs.bzl", "CONLYOPTS", "COPTS", "DEFINES", "FEATURES", "PACKAGE_FEATURES")

elisp/repositories.bzl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,6 @@ def rules_elisp_dependencies():
5959
],
6060
sha256 = "26d4021f6898e23b82ef953078389dd49ac2b5618ac564ade4ef87cced147b38",
6161
)
62-
maybe(
63-
http_archive,
64-
name = "rules_proto",
65-
sha256 = "303e86e722a520f6f326a50b41cfc16b98fe6d1955ce46642a5b7a67c11c0f5d",
66-
strip_prefix = "rules_proto-6.0.0",
67-
url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.0/rules_proto-6.0.0.tar.gz",
68-
)
6962
maybe(
7063
http_archive,
7164
name = "rules_python",

examples/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
load("@bazel_skylib//lib:shell.bzl", "shell")
16-
load("@rules_proto//proto:defs.bzl", "proto_library")
16+
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
1717
load("@rules_python//python:defs.bzl", "py_test")
1818
load(
1919
"//elisp:defs.bzl",

examples/ext/MODULE.bazel.lock

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)