Remove Java proto libraries from rules_java Following the decision to have those in protobuf repository. PiperOrigin-RevId: 613577920 Change-Id: Iaec46ca2eee449c63a5634dec583b7791cb10d6a
diff --git a/java/BUILD b/java/BUILD index fc77d07..e6f5d2c 100644 --- a/java/BUILD +++ b/java/BUILD
@@ -22,7 +22,6 @@ deps = [ ":core_rules", "//java/modules", - "//java/proto:proto_rules", "//java/toolchains:toolchain_rules", ], )
diff --git a/java/defs.bzl b/java/defs.bzl index 51a235b..64263f8 100644 --- a/java/defs.bzl +++ b/java/defs.bzl
@@ -21,8 +21,6 @@ load("//java/modules:java_common.bzl", _java_common = "java_common") load("//java/modules:java_info.bzl", _JavaInfo = "JavaInfo") load("//java/modules:java_plugin_info.bzl", _JavaPluginInfo = "JavaPluginInfo") -load("//java/proto:java_lite_proto_library.bzl", _java_lite_proto_library = "java_lite_proto_library") -load("//java/proto:java_proto_library.bzl", _java_proto_library = "java_proto_library") load("//java/toolchains:java_package_configuration.bzl", _java_package_configuration = "java_package_configuration") load("//java/toolchains:java_runtime.bzl", _java_runtime = "java_runtime") load("//java/toolchains:java_toolchain.bzl", _java_toolchain = "java_toolchain") @@ -44,9 +42,9 @@ java_package_configuration = _java_package_configuration # Proto rules - -java_proto_library = _java_proto_library -java_lite_proto_library = _java_lite_proto_library +# 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
diff --git a/java/proto/BUILD b/java/proto/BUILD index 5876189..209a5f5 100644 --- a/java/proto/BUILD +++ b/java/proto/BUILD
@@ -1,5 +1,3 @@ -load("@bazel_skylib//:bzl_library.bzl", "bzl_library") - package(default_visibility = ["//visibility:public"]) # Toolchain type provided by proto_lang_toolchain rule and used by java_proto_library @@ -8,13 +6,6 @@ # Toolchain type provided by proto_lang_toolchain rule and used by java_lite_proto_library toolchain_type(name = "lite_toolchain_type") -bzl_library( - name = "proto_rules", - srcs = glob(["*.bzl"]), - visibility = ["//visibility:public"], - deps = ["//java/private"], -) - filegroup( name = "srcs", srcs = glob(["**"]),
diff --git a/java/proto/java_lite_proto_library.bzl b/java/proto/java_lite_proto_library.bzl deleted file mode 100644 index 22dd7ab..0000000 --- a/java/proto/java_lite_proto_library.bzl +++ /dev/null
@@ -1,26 +0,0 @@ -# Copyright 2023 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. -"""java_lite_proto_library rule""" - -def java_lite_proto_library(**attrs): - """Bazel java_lite_proto_library rule. - - https://docs.bazel.build/versions/master/be/java.html#java_lite_proto_library - - Args: - **attrs: Rule attributes - """ - - # buildifier: disable=native-java - native.java_lite_proto_library(**attrs)
diff --git a/java/proto/java_proto_library.bzl b/java/proto/java_proto_library.bzl deleted file mode 100644 index fbe9945..0000000 --- a/java/proto/java_proto_library.bzl +++ /dev/null
@@ -1,26 +0,0 @@ -# Copyright 2023 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. -"""java_proto_library rule""" - -def java_proto_library(**attrs): - """Bazel java_proto_library rule. - - https://docs.bazel.build/versions/master/be/java.html#java_proto_library - - Args: - **attrs: Rule attributes - """ - - # buildifier: disable=native-java - native.java_proto_library(**attrs)