Skip to content

Commit 43be561

Browse files
authored
Ensure that associates are being included in the source dep_infos list (#1337)
* Ensure that associates are being included in the source dep_infos list * Update jvm_deps.bzl
1 parent e778dcb commit 43be561

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

kotlin/internal/jvm/jvm_deps.bzl

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,17 @@ def _java_info(target):
2323

2424
def _jvm_deps(ctx, toolchains, associate_deps, deps = [], deps_java_infos = [], exports = [], runtime_deps = []):
2525
"""Encapsulates jvm dependency metadata."""
26-
dep_infos = deps_java_infos + [_java_info(d) for d in deps] + [toolchains.kt.jvm_stdlibs]
27-
28-
associates = _associate_utils.get_associates(ctx, toolchains = toolchains, associates = associate_deps)
26+
associates = _associate_utils.get_associates(
27+
ctx,
28+
toolchains = toolchains,
29+
associates = associate_deps,
30+
)
31+
dep_infos = (
32+
[toolchains.kt.jvm_stdlibs] +
33+
associates.dep_infos +
34+
deps_java_infos +
35+
[_java_info(d) for d in deps]
36+
)
2937

3038
# Reduced classpath, exclude transitive deps from compilation
3139
if (toolchains.kt.experimental_prune_transitive_deps and
@@ -41,17 +49,14 @@ def _jvm_deps(ctx, toolchains, associate_deps, deps = [], deps_java_infos = [],
4149
] + [
4250
d.transitive_compile_time_jars
4351
for d in dep_infos
44-
] + [
45-
d.transitive_compile_time_jars
46-
for d in associates.dep_infos
4752
]
4853

4954
compile_depset_list = depset(transitive = transitive + [associates.jars]).to_list()
5055
compile_depset_list_filtered = [jar for jar in compile_depset_list if not _sets.contains(associates.abi_jar_set, jar)]
5156

5257
return struct(
5358
module_name = associates.module_name,
54-
deps = dep_infos + associates.dep_infos,
59+
deps = dep_infos,
5560
exports = [_java_info(d) for d in exports],
5661
associate_jars = associates.jars,
5762
compile_jars = depset(direct = compile_depset_list_filtered),

0 commit comments

Comments
 (0)