Remove deprecated java_common fields (#519)

* Remove deprecated java_common fields * Bazel 4.0.0
bazelbuild · Apr 25, 2021 · e608bf3 · e608bf3
1 parent 6f5f8ce
commit e608bf3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git 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:

diff --git 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
@@ -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),
             strict_deps = toolchains.kt.experimental_strict_kotlin_deps,
         )