Skip to content

Commit

Permalink
Remove deprecated java_common fields
Browse files Browse the repository at this point in the history
  • Loading branch information
Bencodes committed Apr 1, 2021
1 parent c58b5cb commit 7e4c4eb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.0
4.0.0
3 changes: 0 additions & 3 deletions kotlin/internal/jvm/compile.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -600,12 +600,10 @@ def kt_jvm_produce_jar_actions(ctx, rule_kind):

source_jar = java_common.pack_sources(
ctx.actions,
output_jar = output_jar,
output_source_jar = ctx.outputs.srcjar,
sources = srcs.kt + srcs.java,
source_jars = srcs.src_jars + generated_src_jars,
java_toolchain = toolchains.java,
host_javabase = toolchains.java_runtime,
)

java_info = JavaInfo(
Expand Down Expand Up @@ -784,7 +782,6 @@ def _run_kt_java_builder_actions(
java_toolchain = toolchains.java,
plugins = _plugin_mappers.targets_to_annotation_processors_java_info(ctx.attr.plugins),
javac_opts = javac_opts,
host_javabase = toolchains.java_runtime,
neverlink = getattr(ctx.attr, "neverlink", False),
)
ap_generated_src_jar = java_info.annotation_processing.source_jar
Expand Down

0 comments on commit 7e4c4eb

Please sign in to comment.