Skip to content
This repository has been archived by the owner on Aug 5, 2024. It is now read-only.

Commit

Permalink
better aspects
Browse files Browse the repository at this point in the history
  • Loading branch information
abrams27 committed Apr 5, 2022
1 parent cd9227d commit 4e7a91f
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions install/src/main/java/org/jetbrains/bsp/bazel/install/aspects.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,20 @@ def extract_scala_info(target, ctx, output_groups):
)
return scala_info

def extract_runtime_jars(target, provider):
compilation_info = getattr(provider, "compilation_info", None)

if compilation_info:
return compilation_info.runtime_classpath

return getattr(provider, "transitive_runtime_jars", target[JavaInfo].transitive_runtime_jars)


def extract_compile_jars(provider):
compilation_info = getattr(provider, "compilation_info", None)

return compilation_info.compilation_classpath if compilation_info else provider.transitive_compile_time_jars

def extract_java_info(target, ctx, output_groups):
provider = get_java_provider(target)
if not provider:
Expand All @@ -204,8 +218,8 @@ def extract_java_info(target, ctx, output_groups):
generated_jars, resolve_files_generated_jars = get_generated_jars(provider)
resolve_files += resolve_files_generated_jars

runtime_jars = (provider.compilation_info.runtime_classpath if target[JavaInfo].compilation_info else target[JavaInfo].transitive_runtime_jars).to_list()
compile_jars = (provider.compilation_info.compilation_classpath if target[JavaInfo].compilation_info else provider.transitive_compile_time_jars).to_list()
runtime_jars = extract_runtime_jars(target, provider).to_list()
compile_jars = extract_compile_jars(provider).to_list()
source_jars = provider.transitive_source_jars.to_list()
resolve_files += runtime_jars
resolve_files += compile_jars
Expand Down

0 comments on commit 4e7a91f

Please sign in to comment.