Skip to content
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

Remove deprecated java_common fields #519

Merged
merged 2 commits into from
Apr 25, 2021
Merged

Remove deprecated java_common fields #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e133e0d
Remove deprecated java_common fields
Bencodes Apr 1, 2021
9a5f388
Bazel 4.0.0
Bencodes Apr 2, 2021
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
2 changes: 1 addition & 1 deletion .bazelci/presubmit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
validate_config: 1
bazel: 3.7.0
bazel: 4.0.0
tasks:
ubuntu1604:
build_targets:
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
View file
Open in desktop
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
View file
Open in desktop
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