diff --git a/kotlin/internal/lint/ktlint_fix.bzl b/kotlin/internal/lint/ktlint_fix.bzl index 86deb6e99..d03639a09 100644 --- a/kotlin/internal/lint/ktlint_fix.bzl +++ b/kotlin/internal/lint/ktlint_fix.bzl @@ -92,11 +92,12 @@ fi SRCS=({srcs}) SRCS=${{SRCS[@]/#/$BUILD_DIR}} -"$TOOL" {args} $SRCS +PATH=\"$(dirname "{binjava}"):$PATH\" "$TOOL" {args} $SRCS """.format( executable = ctx.executable._ktlint_tool.path, args = " ".join(args), srcs = " ".join([src.path for src in ctx.files.srcs]), + binjava = ctx.toolchains["@bazel_tools//tools/jdk:runtime_toolchain_type"].java_runtime.java_executable_runfiles_path, ) content = ctx.expand_location(content, [ctx.attr._ktlint_tool]) @@ -109,9 +110,10 @@ SRCS=${{SRCS[@]/#/$BUILD_DIR}} ) files = [ctx.executable._ktlint_tool] + transitive_files = ctx.toolchains["@bazel_tools//tools/jdk:runtime_toolchain_type"].java_runtime.files if editorconfig: files.append(editorconfig) - runfiles = ctx.runfiles(files = files) + runfiles = ctx.runfiles(files = files, transitive_files = transitive_files) return [ DefaultInfo( @@ -141,6 +143,9 @@ ktlint_fix = rule( cfg = "target", ), }, + toolchains = [ + "@bazel_tools//tools/jdk:runtime_toolchain_type", + ], executable = True, doc = "Lint Kotlin files and automatically fix them as needed", )