Remove @rules_cc//cc:defs.bzl references Copybara Import from https://github.com/bazelbuild/rules_java/pull/228 BEGIN_PUBLIC Remove @rules_cc//cc:defs.bzl references (#228) Referring to @rules_cc//cc:defs.bzl, refers to @protobuf//bazel:java_proto_library.bzl, which fetches protobuf repository. Referring directly to what's needed limits the fetches just to rules_cc. Closes #228 END_PUBLIC COPYBARA_INTEGRATE_REVIEW=https://github.com/bazelbuild/rules_java/pull/228 from comius:remove-cc-defs e1f3016584ecd873b0a6464f34c5c5ad0b778159 PiperOrigin-RevId: 684759221 Change-Id: I53856709635e6f6d35f3ae67dc57f2857af1db6f
diff --git a/MODULE.bazel b/MODULE.bazel index 09611e8..ef6c420 100644 --- a/MODULE.bazel +++ b/MODULE.bazel
@@ -6,7 +6,7 @@ ) bazel_dep(name = "platforms", version = "0.0.4") -bazel_dep(name = "rules_cc", version = "0.0.10") +bazel_dep(name = "rules_cc", version = "0.0.13") bazel_dep(name = "bazel_features", version = "1.11.0") bazel_dep(name = "bazel_skylib", version = "1.6.1") bazel_dep(name = "protobuf", version = "27.0")
diff --git a/toolchains/BUILD b/toolchains/BUILD index f78c3b9..191c311 100644 --- a/toolchains/BUILD +++ b/toolchains/BUILD
@@ -1,5 +1,5 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library") -load("@rules_cc//cc:defs.bzl", "cc_library") +load("@rules_cc//cc:cc_library.bzl", "cc_library") load( ":default_java_toolchain.bzl", "DEFAULT_TOOLCHAIN_CONFIGURATION",
diff --git a/toolchains/default_java_toolchain.bzl b/toolchains/default_java_toolchain.bzl index 8cbb17a..0c81bdb 100644 --- a/toolchains/default_java_toolchain.bzl +++ b/toolchains/default_java_toolchain.bzl
@@ -14,8 +14,8 @@ """Rules for defining default_java_toolchain""" -load("//java:defs.bzl", "java_toolchain") load("//java/common:java_common.bzl", "java_common") +load("//java/toolchains:java_toolchain.bzl", "java_toolchain") # JVM options, without patching java.compiler and jdk.compiler modules. BASE_JDK9_JVM_OPTS = [
diff --git a/toolchains/jdk_build_file.bzl b/toolchains/jdk_build_file.bzl index 1e08f37..c0ed160 100644 --- a/toolchains/jdk_build_file.bzl +++ b/toolchains/jdk_build_file.bzl
@@ -14,7 +14,7 @@ """A templated BUILD file for Java repositories.""" -JDK_BUILD_TEMPLATE = """load("@rules_java//java:defs.bzl", "java_runtime") +JDK_BUILD_TEMPLATE = """load("@rules_java//java/toolchains:java_runtime.bzl", "java_runtime") package(default_visibility = ["//visibility:public"])
diff --git a/toolchains/local_java_repository.bzl b/toolchains/local_java_repository.bzl index e012367..17b1a0e 100644 --- a/toolchains/local_java_repository.bzl +++ b/toolchains/local_java_repository.bzl
@@ -14,7 +14,7 @@ """Rules for importing a local JDK.""" -load("//java:defs.bzl", "java_runtime") +load("//java/toolchains:java_runtime.bzl", "java_runtime") load(":default_java_toolchain.bzl", "default_java_toolchain") def _detect_java_version(repository_ctx, java_bin):