From 43051c9d871f200297c8a99e5f2138ddf190ca53 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sun, 21 Sep 2025 14:02:51 +0000 Subject: [PATCH] refactor: remove rules_proto dependency and update proto_library references Signed-off-by: Matthieu MOREL --- MODULE.bazel | 1 - WORKSPACE | 4 ---- bazel/repositories.bzl | 8 -------- common/BUILD | 2 +- language-agent/BUILD | 2 +- 5 files changed, 2 insertions(+), 15 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index a86aade..a52fc5e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -21,6 +21,5 @@ module( repo_name = "skywalking_data_collect_protocol", ) -bazel_dep(name = "rules_proto", version = "7.1.0") bazel_dep(name = "grpc", version = "1.74.1", repo_name = "com_github_grpc_grpc") bazel_dep(name = "protobuf", version = "32.0", repo_name = "com_google_protobuf") diff --git a/WORKSPACE b/WORKSPACE index d33b586..ccb5d50 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -21,10 +21,6 @@ load("//bazel:repositories.bzl", "skywalking_data_collect_protocol_dependencies" skywalking_data_collect_protocol_dependencies() -load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies") - -rules_proto_dependencies() - load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps") grpc_deps() diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 429ce2f..719eb6a 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -18,14 +18,6 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") def skywalking_data_collect_protocol_dependencies(): - if "rules_proto" not in native.existing_rules(): - http_archive( - name = "rules_proto", - sha256 = "14a225870ab4e91869652cfd69ef2028277fc1dc4910d65d353b62d6e0ae21f4", - strip_prefix = "rules_proto-7.1.0", - urls = ["https://github.com/bazelbuild/rules_proto/releases/download/7.1.0/rules_proto-7.1.0.tar.gz"], - ) - if "com_github_grpc_grpc" not in native.existing_rules(): http_archive( name = "com_github_grpc_grpc", diff --git a/common/BUILD b/common/BUILD index 061e22a..4f7f6f0 100644 --- a/common/BUILD +++ b/common/BUILD @@ -15,7 +15,7 @@ # limitations under the License. # -load("@rules_proto//proto:defs.bzl", "proto_library") +load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") package(default_visibility = ["//visibility:public"]) diff --git a/language-agent/BUILD b/language-agent/BUILD index a37c879..423f740 100644 --- a/language-agent/BUILD +++ b/language-agent/BUILD @@ -17,7 +17,7 @@ load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library") load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@rules_proto//proto:defs.bzl", "proto_library") +load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") package(default_visibility = ["//visibility:public"])