Remove rules_proto dependency PiperOrigin-RevId: 683519641 Change-Id: I0f74eeb7cfb8b8b4eff498f5e0b9abb8dc808f7a
diff --git a/MODULE.bazel b/MODULE.bazel index 308c493..efdad89 100644 --- a/MODULE.bazel +++ b/MODULE.bazel
@@ -12,7 +12,6 @@ bazel_dep(name = "protobuf", version = "27.0") # Required by @remote_java_tools, which is loaded via module extension. -bazel_dep(name = "rules_proto", version = "6.0.2") bazel_dep(name = "rules_license", version = "0.0.3") bazel_dep(name = "abseil-cpp", version = "20230802.1", repo_name = "com_google_absl")
diff --git a/java/BUILD b/java/BUILD index 6287560..66bfb07 100644 --- a/java/BUILD +++ b/java/BUILD
@@ -26,6 +26,8 @@ ":core_rules", "//java/common", "//java/toolchains:toolchain_rules", + "@protobuf//bazel:java_lite_proto_library_bzl", + "@protobuf//bazel:java_proto_library_bzl", ], )
diff --git a/java/defs.bzl b/java/defs.bzl index 64de71a..e73d633 100644 --- a/java/defs.bzl +++ b/java/defs.bzl
@@ -13,6 +13,8 @@ # limitations under the License. """Starlark rules for building Java projects.""" +load("@protobuf//bazel:java_lite_proto_library.bzl", _java_lite_proto_library = "java_lite_proto_library") +load("@protobuf//bazel:java_proto_library.bzl", _java_proto_library = "java_proto_library") load("//java:java_binary.bzl", _java_binary = "java_binary") load("//java:java_import.bzl", _java_import = "java_import") load("//java:java_library.bzl", _java_library = "java_library") @@ -41,8 +43,8 @@ # Proto rules # Deprecated: don't use java proto libraries from here -java_proto_library = native.java_proto_library -java_lite_proto_library = native.java_lite_proto_library +java_proto_library = _java_proto_library +java_lite_proto_library = _java_lite_proto_library # Modules and providers
diff --git a/java/defs.bzl.oss b/java/defs.bzl.oss new file mode 100644 index 0000000..28f61ca --- /dev/null +++ b/java/defs.bzl.oss
@@ -0,0 +1,51 @@ +# Copyright 2019 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Starlark rules for building Java projects.""" + +load("//third_party/bazel_rules/rules_java/java:java_binary.bzl", _java_binary = "java_binary") +load("//third_party/bazel_rules/rules_java/java:java_import.bzl", _java_import = "java_import") +load("//third_party/bazel_rules/rules_java/java:java_library.bzl", _java_library = "java_library") +load("//third_party/bazel_rules/rules_java/java:java_plugin.bzl", _java_plugin = "java_plugin") +load("//third_party/bazel_rules/rules_java/java:java_test.bzl", _java_test = "java_test") +load("//third_party/bazel_rules/rules_java/java/common:java_common.bzl", _java_common = "java_common") +load("//third_party/bazel_rules/rules_java/java/common:java_info.bzl", _JavaInfo = "JavaInfo") +load("//third_party/bazel_rules/rules_java/java/common:java_plugin_info.bzl", _JavaPluginInfo = "JavaPluginInfo") +load("//third_party/bazel_rules/rules_java/java/toolchains:java_package_configuration.bzl", _java_package_configuration = "java_package_configuration") +load("//third_party/bazel_rules/rules_java/java/toolchains:java_runtime.bzl", _java_runtime = "java_runtime") +load("//third_party/bazel_rules/rules_java/java/toolchains:java_toolchain.bzl", _java_toolchain = "java_toolchain") + +# Language rules + +java_binary = _java_binary +java_test = _java_test +java_library = _java_library +java_plugin = _java_plugin +java_import = _java_import + +# Toolchain rules + +java_runtime = _java_runtime +java_toolchain = _java_toolchain +java_package_configuration = _java_package_configuration + +# Proto rules +# Deprecated: don't use java proto libraries from here +java_proto_library = native.java_proto_library +java_lite_proto_library = native.java_lite_proto_library + +# Modules and providers + +JavaInfo = _JavaInfo +JavaPluginInfo = _JavaPluginInfo +java_common = _java_common