@@ -23,9 +23,17 @@ def _java_info(target):
23
23
24
24
def _jvm_deps (ctx , toolchains , associate_deps , deps = [], deps_java_infos = [], exports = [], runtime_deps = []):
25
25
"""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
+ )
29
37
30
38
# Reduced classpath, exclude transitive deps from compilation
31
39
if (toolchains .kt .experimental_prune_transitive_deps and
@@ -41,17 +49,14 @@ def _jvm_deps(ctx, toolchains, associate_deps, deps = [], deps_java_infos = [],
41
49
] + [
42
50
d .transitive_compile_time_jars
43
51
for d in dep_infos
44
- ] + [
45
- d .transitive_compile_time_jars
46
- for d in associates .dep_infos
47
52
]
48
53
49
54
compile_depset_list = depset (transitive = transitive + [associates .jars ]).to_list ()
50
55
compile_depset_list_filtered = [jar for jar in compile_depset_list if not _sets .contains (associates .abi_jar_set , jar )]
51
56
52
57
return struct (
53
58
module_name = associates .module_name ,
54
- deps = dep_infos + associates . dep_infos ,
59
+ deps = dep_infos ,
55
60
exports = [_java_info (d ) for d in exports ],
56
61
associate_jars = associates .jars ,
57
62
compile_jars = depset (direct = compile_depset_list_filtered ),
0 commit comments