Skip to content

Commit 463b169

Browse files
authored
1 parent d5e3efb commit 463b169

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

aspect/intellij_info_impl.bzl

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,19 @@ def get_source_jars(output):
150150
return [output.source_jar]
151151
return []
152152

153-
def library_artifact(java_output):
153+
def library_artifact(java_output, rule_kind = None):
154154
"""Creates a LibraryArtifact representing a given java_output."""
155155
if java_output == None or java_output.class_jar == None:
156156
return None
157157
src_jars = get_source_jars(java_output)
158+
159+
if rule_kind != None and rule_kind.startswith("scala"):
160+
interface_jar = None
161+
else:
162+
interface_jar = artifact_location(java_output.ijar)
163+
158164
return struct_omit_none(
159-
interface_jar = artifact_location(java_output.ijar),
165+
interface_jar = interface_jar,
160166
jar = artifact_location(java_output.class_jar),
161167
source_jar = artifact_location(src_jars[0]) if src_jars else None,
162168
source_jars = [artifact_location(f) for f in src_jars],
@@ -597,7 +603,7 @@ def collect_java_info(target, ctx, semantics, ide_info, ide_info_file, output_gr
597603

598604
ide_info_files = []
599605
sources = sources_from_target(ctx)
600-
jars = [library_artifact(output) for output in java_outputs]
606+
jars = [library_artifact(output, ctx.rule.kind) for output in java_outputs]
601607
class_jars = [output.class_jar for output in java_outputs if output and output.class_jar]
602608
output_jars = [jar for output in java_outputs for jar in jars_from_output(output)]
603609
resolve_files = output_jars

0 commit comments

Comments
 (0)