From 298e533d0c78536c16f42f9654f3143ec059ec09 Mon Sep 17 00:00:00 2001 From: Ladinu Date: Mon, 20 May 2024 08:37:17 -0700 Subject: [PATCH] Allow users to configure value when building a scala library --- scala/private/phases/phase_compile.bzl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scala/private/phases/phase_compile.bzl b/scala/private/phases/phase_compile.bzl index d1534aabb..2449c710d 100644 --- a/scala/private/phases/phase_compile.bzl +++ b/scala/private/phases/phase_compile.bzl @@ -32,6 +32,7 @@ def phase_compile_binary(ctx, p): def phase_compile_library(ctx, p): args = struct( srcjars = p.collect_srcjars, + buildijar = ctx.attr.build_ijar if hasattr(ctx.attr, "build_ijar") else _ijar_default_value(ctx), unused_dependency_checker_ignored_targets = [ target.label for target in p.scalac_provider.default_classpath + ctx.attr.exports + @@ -102,7 +103,7 @@ def phase_compile_common(ctx, p): return _phase_compile_default(ctx, p) def _phase_compile_default(ctx, p, _args = struct()): - buildijar_default_value = True if ctx.toolchains["@io_bazel_rules_scala//scala:toolchain_type"].scala_version.startswith("2.") else False + buildijar_default_value = _ijar_default_value(ctx) return _phase_compile( ctx, @@ -389,3 +390,6 @@ def _interim_java_provider_for_java_compilation(scala_output): compile_jar = scala_output, neverlink = True, ) + +def _ijar_default_value(ctx): + return True if ctx.toolchains["@io_bazel_rules_scala//scala:toolchain_type"].scala_version.startswith("2.") else False