From c01497acb5a01c2fe025988ff5b15aabb10c2a5c Mon Sep 17 00:00:00 2001 From: Mantas Sakalauskas Date: Fri, 14 Jan 2022 09:46:11 +0200 Subject: [PATCH] feat(phase-compile): disable ijar for scala3 --- scala/private/phases/phase_compile.bzl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scala/private/phases/phase_compile.bzl b/scala/private/phases/phase_compile.bzl index dfd44f532..9939d8061 100644 --- a/scala/private/phases/phase_compile.bzl +++ b/scala/private/phases/phase_compile.bzl @@ -17,6 +17,9 @@ load( _compile_scala = "compile_scala", ) load(":resources.bzl", _resource_paths = "paths") +load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_VERSION") + +buildijar_default_value = True if SCALA_VERSION.startswith("2.") else False def phase_compile_binary(ctx, p): args = struct( @@ -106,7 +109,7 @@ def _phase_compile_default(ctx, p, _args = struct()): ctx, p, _args.srcjars if hasattr(_args, "srcjars") else depset(), - _args.buildijar if hasattr(_args, "buildijar") else True, + _args.buildijar if hasattr(_args, "buildijar") else buildijar_default_value, _args.implicit_junit_deps_needed_for_java_compilation if hasattr(_args, "implicit_junit_deps_needed_for_java_compilation") else [], unused_dependency_checker_ignored_targets = _args.unused_dependency_checker_ignored_targets if hasattr(_args, "unused_dependency_checker_ignored_targets") else [], )