Skip to content

Commit 9c0f6b9

Browse files
Bazel 7.0 rc2 support (#1524)
Added `@bazel_tools//tools/jdk:toolchain_type` toolchain scala_junit_test: bazelbuild/bazel#18970 Changed deprecated transitive_runtime_deps to transitive_runtime_jars in jmh.bzl: https://bazel.build/versions/6.4.0/rules/lib/JavaInfo#transitive_runtime_deps
1 parent 421a9e8 commit 9c0f6b9

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

jmh/jmh.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def _scala_generate_benchmark(ctx):
3939

4040
# just try to take the first one and see if that works
4141
class_jar = outs[0].class_jar
42-
classpath = info.transitive_runtime_deps
42+
classpath = info.transitive_runtime_jars
4343
ctx.actions.run(
4444
outputs = [ctx.outputs.src_jar, ctx.outputs.resource_jar],
4545
inputs = classpath,

scala/private/rules/scala_junit_test.bzl

+4-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,10 @@ def make_scala_junit_test(*extras):
136136
*[extra["outputs"] for extra in extras if "outputs" in extra]
137137
),
138138
test = True,
139-
toolchains = ["@io_bazel_rules_scala//scala:toolchain_type"],
139+
toolchains = [
140+
"@io_bazel_rules_scala//scala:toolchain_type",
141+
"@bazel_tools//tools/jdk:toolchain_type",
142+
],
140143
incompatible_use_toolchain_transition = True,
141144
implementation = _scala_junit_test_impl,
142145
)

0 commit comments

Comments
 (0)