commit 3f51eebf65701344b84a4b9e65dce2b3ff961e51
author nickreid <nickreid@google.com> Mon Dec 05 20:33:55 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Dec 05 20:34:30 2022 -0800
tree cce238009e637c45642e66493dee1c0962049ee6
parent 2004271f53023a9452b43a8ef79f24a4b183eb3d

Eliminate merged_deps from common.kt_jvm_import

PiperOrigin-RevId: 493189136

kotlin/common.bzl

diff --git a/kotlin/common.bzl b/kotlin/common.bzl
index 8f0dd64..16ad59e 100644
--- a/kotlin/common.bzl
+++ b/kotlin/common.bzl
@@ -1097,10 +1097,7 @@
         fail("Must import at least one JAR")
 
     file_factory = FileFactory(ctx, jars[0])
-    deps += list(deps)  # Defensive copy
-
-    deps.extend(kt_toolchain.kotlin_libs)
-    merged_deps = java_common.merge(deps)
+    deps = java_common.merge(deps + kt_toolchain.kotlin_libs)
 
     # Check that any needed deps are declared unless neverlink, in which case Jars won't be used
     # at runtime so we skip the check, though we'll populate jdeps either way.
@@ -1108,7 +1105,7 @@
     _run_import_deps_checker(
         ctx,
         jars_to_check = jars,
-        merged_deps = merged_deps,
+        merged_deps = deps,
         enforce_strict_deps = not neverlink,
         jdeps_output = jdeps_output,
         deps_checker = deps_checker,
@@ -1120,7 +1117,7 @@
             output_jar = jar,
             compile_jar = jar,
             source_jar = srcjar,
-            deps = deps,
+            deps = [deps],
             runtime_deps = runtime_deps,
             neverlink = neverlink,
             # TODO: Set compile-time jdeps to help reduce Javac classpaths downstream