From 2d31f6b4121d2c3952b9c233b8e784a0d9271151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gergely=20F=C3=A1bi=C3=A1n?= Date: Fri, 3 Nov 2023 10:49:47 +0100 Subject: [PATCH] Bazel 7.0 rc2 support Added `@bazel_tools//tools/jdk:toolchain_type` toolchain scala_junit_test: https://github.com/bazelbuild/bazel/issues/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 --- jmh/jmh.bzl | 2 +- scala/private/rules/scala_junit_test.bzl | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jmh/jmh.bzl b/jmh/jmh.bzl index b72795b3e..4220b3123 100644 --- a/jmh/jmh.bzl +++ b/jmh/jmh.bzl @@ -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, diff --git a/scala/private/rules/scala_junit_test.bzl b/scala/private/rules/scala_junit_test.bzl index c45d4592d..192afa056 100644 --- a/scala/private/rules/scala_junit_test.bzl +++ b/scala/private/rules/scala_junit_test.bzl @@ -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, )