Skip to content

Pass generated_source_jar to the final JavaInfo #1223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2024
Merged

Pass generated_source_jar to the final JavaInfo #1223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions kotlin/internal/jvm/compile.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,13 @@ def kt_jvm_produce_jar_actions(ctx, rule_kind):
java_toolchain = toolchains.java,
)

generated_source_jar = java_common.pack_sources(
ctx.actions,
output_source_jar = ctx.actions.declare_file(ctx.label.name + "-gensrc.jar"),
source_jars = generated_src_jars,
java_toolchain = toolchains.java,
) if generated_src_jars else None

java_info = JavaInfo(
output_jar = output_jar,
compile_jar = compile_jar,
Expand All @@ -662,6 +669,7 @@ def kt_jvm_produce_jar_actions(ctx, rule_kind):
runtime_deps = [_java_info(d) for d in ctx.attr.runtime_deps],
exports = [_java_info(d) for d in getattr(ctx.attr, "exports", [])],
neverlink = getattr(ctx.attr, "neverlink", False),
generated_source_jar = generated_source_jar,
)

instrumented_files = coverage_common.instrumented_files_info(
Expand Down