From e133e0db85799fcd3a6c9c981921294ca5ed2e6f Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Thu, 1 Apr 2021 12:04:26 -0700 Subject: [PATCH 1/2] Remove deprecated java_common fields --- .bazelversion | 2 +- kotlin/internal/jvm/compile.bzl | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.bazelversion b/.bazelversion index 7c69a55db..fcdb2e109 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -3.7.0 +4.0.0 diff --git a/kotlin/internal/jvm/compile.bzl b/kotlin/internal/jvm/compile.bzl index dcb636b95..b865b3eb2 100644 --- a/kotlin/internal/jvm/compile.bzl +++ b/kotlin/internal/jvm/compile.bzl @@ -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( @@ -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 From 9a5f38889d3dec4ae6c666951b2d83704de3370c Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Fri, 2 Apr 2021 08:46:41 -0700 Subject: [PATCH 2/2] Bazel 4.0.0 --- .bazelci/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 10947647f..9ff4cf3a5 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -1,6 +1,6 @@ --- validate_config: 1 -bazel: 3.7.0 +bazel: 4.0.0 tasks: ubuntu1604: build_targets: