From af1b22a9780acfe10bb658bde97f138a66aa7a41 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Mon, 25 Sep 2023 17:06:22 -0700 Subject: [PATCH] fix(jvm): explicitly merge runfiles Fixes a TODO about collecting proper transitive data. Note: I don't know where a test for this belongs, nor whether there are other providers which should be scanned for data originating from srcs/deps --- kotlin/internal/jvm/impl.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kotlin/internal/jvm/impl.bzl b/kotlin/internal/jvm/impl.bzl index 03b3d0c4b..341b6e509 100644 --- a/kotlin/internal/jvm/impl.bzl +++ b/kotlin/internal/jvm/impl.bzl @@ -50,10 +50,10 @@ def _make_providers(ctx, providers, transitive_files = depset(order = "default") # explicitly include data files, otherwise they appear to be missing files = ctx.files.data, transitive_files = transitive_files, - # continue to use collect_default until proper transitive data collecting is - # implmented. - collect_default = True, - ), + ).merge_all([ + target[DefaultInfo].default_runfiles + for target in ctx.attr.runtime_deps + ]), ), ] + list(additional_providers), )