Merge pull request #6 from cgruber/various_fixes

Ensure that the runtime deps pass along their javainfo if present
bazelbuild · Jun 12, 2019 · 7cb4645 · 7cb4645
2 parents fc3c0db + 9198f14
commit 7cb4645
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/kotlin/internal/jvm/impl.bzl b/kotlin/internal/jvm/impl.bzl
@@ -127,9 +127,9 @@ def kt_jvm_import_impl(ctx):
             DefaultInfo(files = depset(jars)),
             JavaInfo(
                 output_jar = jars[0],
-                compile_jar = jars[0],
-                source_jar = source_jar,
-                runtime_deps = ctx.attr.runtime_deps,
+                source_jars = [source_jar] if bool(source_jar) else [],
+                runtime_deps = [dep[JavaInfo] for dep in ctx.attr.runtime_deps if JavaInfo in dep],
+                use_ijar = False,
                 neverlink = getattr(ctx.attr, "neverlink", False),
             ),
             kt_info,