Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module(

bazel_dep(name = "platforms", version = "0.0.11")
bazel_dep(name = "rules_cc", version = "0.2.25")
bazel_dep(name = "bazel_features", version = "1.30.0")
bazel_dep(name = "bazel_features", version = "1.55.0")
bazel_dep(name = "bazel_skylib", version = "1.6.1")
bazel_dep(name = "protobuf", version = "32.1", repo_name = "com_google_protobuf")
bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
Expand Down
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ http_archive(

http_archive(
name = "bazel_features",
sha256 = "a660027f5a87f13224ab54b8dc6e191693c554f2692fcca46e8e29ee7dabc43b",
strip_prefix = "bazel_features-1.30.0",
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.30.0/bazel_features-v1.30.0.tar.gz",
sha256 = "2ed1fdce7e51ba2149dfab73eab6e402217c8e27d17e1d4a48d4d86bdd9eaef6",
strip_prefix = "bazel_features-1.55.0",
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.55.0/bazel_features-v1.55.0.tar.gz",
)

load("@bazel_features//:deps.bzl", "bazel_features_deps")
Expand Down
6 changes: 3 additions & 3 deletions distro/relnotes.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ http_archive(

http_archive(
name = "bazel_features",
sha256 = "a660027f5a87f13224ab54b8dc6e191693c554f2692fcca46e8e29ee7dabc43b",
strip_prefix = "bazel_features-1.30.0",
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.30.0/bazel_features-v1.30.0.tar.gz",
sha256 = "2ed1fdce7e51ba2149dfab73eab6e402217c8e27d17e1d4a48d4d86bdd9eaef6",
strip_prefix = "bazel_features-1.55.0",
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.55.0/bazel_features-v1.55.0.tar.gz",
)

load("@bazel_features//:deps.bzl", "bazel_features_deps")
Expand Down
6 changes: 3 additions & 3 deletions test/repo/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "bazel_features",
sha256 = "a660027f5a87f13224ab54b8dc6e191693c554f2692fcca46e8e29ee7dabc43b",
strip_prefix = "bazel_features-1.30.0",
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.30.0/bazel_features-v1.30.0.tar.gz",
sha256 = "2ed1fdce7e51ba2149dfab73eab6e402217c8e27d17e1d4a48d4d86bdd9eaef6",
strip_prefix = "bazel_features-1.55.0",
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.55.0/bazel_features-v1.55.0.tar.gz",
)

load("@bazel_features//:deps.bzl", "bazel_features_deps")
Expand Down
31 changes: 25 additions & 6 deletions toolchains/BUILD
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@bazel_features//:features.bzl", "bazel_features")
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_setting")
load("@rules_cc//cc:cc_library.bzl", "cc_library")
Expand Down Expand Up @@ -60,8 +61,14 @@ bool_flag(
#
# Obtain the associated JavaToolchainInfo via:
# ctx.toolchains["@bazel_tools//tools/jdk:toolchain_type"].java
# TODO: migrate away from using @bazel_tools//tools/jdk:toolchain_type ?
# toolchain_type(name = "toolchain_type")
# buildifier: disable=no-effect
toolchain_type(
name = "toolchain_type",
) if bazel_features.java._toolchain_type_in_rules_java else alias(
Comment thread
fmeum marked this conversation as resolved.
Resolved
# buildifier: disable=duplicated-name
name = "toolchain_type",
actual = "@bazel_tools//tools/jdk:toolchain_type",
)

# The Java runtime that executable Java compilation outputs (e.g., java_binary with
# create_executable = True) will run on.
Expand All @@ -72,8 +79,14 @@ bool_flag(
#
# Obtain the associated JavaRuntimeInfo via:
# ctx.toolchains["@bazel_tools//tools/jdk:runtime_toolchain_type"].java_runtime
# TODO: migrate away from using @bazel_tools//tools/jdk:runtime_toolchain_type ?
# toolchain_type(name = "runtime_toolchain_type")
# buildifier: disable=no-effect
toolchain_type(
name = "runtime_toolchain_type",
) if bazel_features.java._toolchain_type_in_rules_java else alias(
# buildifier: disable=duplicated-name
name = "runtime_toolchain_type",
actual = "@bazel_tools//tools/jdk:runtime_toolchain_type",
)

# The Java runtime to extract the bootclasspath from that is then used to compile Java sources.
#
Expand All @@ -84,8 +97,14 @@ bool_flag(
#
# Toolchains of this type are only consumed internally by the bootclasspath rule and should not be
# accessed from Starlark.
# TODO: migrate away from using @bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type ?
# toolchain_type(name = "bootstrap_runtime_toolchain_type")
# buildifier: disable=no-effect
toolchain_type(
name = "bootstrap_runtime_toolchain_type",
) if bazel_features.java._toolchain_type_in_rules_java else alias(
# buildifier: disable=duplicated-name
name = "bootstrap_runtime_toolchain_type",
actual = "@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type",
)

# Points to toolchain[":runtime_toolchain_type"] (was :legacy_current_java_runtime)
java_runtime_alias(name = "current_java_runtime")
Expand Down