Skip to content

Bazel 7.0 rc2 support #1524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 6, 2023
Merged

Bazel 7.0 rc2 support #1524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 jmh/jmh.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def _scala_generate_benchmark(ctx):

# just try to take the first one and see if that works
class_jar = outs[0].class_jar
classpath = info.transitive_runtime_deps
classpath = info.transitive_runtime_jars
ctx.actions.run(
outputs = [ctx.outputs.src_jar, ctx.outputs.resource_jar],
inputs = classpath,
Expand Down
5 changes: 4 additions & 1 deletion scala/private/rules/scala_junit_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,10 @@ def make_scala_junit_test(*extras):
*[extra["outputs"] for extra in extras if "outputs" in extra]
),
test = True,
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
toolchains = [
"@io_bazel_rules_scala//scala:toolchain_type",
"@bazel_tools//tools/jdk:toolchain_type",
],
incompatible_use_toolchain_transition = True,
implementation = _scala_junit_test_impl,
)
Expand Down