Add neverlink and export support.

Author: restingbull

src/main/starlark/core/compile/rules.bzl

@@ -17,6 +17,19 @@ _COMMON_ATTRS = {
         ],
         allow_files = False,
     ),
+    "exports": attr.label_list(
+        doc = """\
+    Exported libraries.
+
+    Deps listed here will be made available to other rules, as if the parents explicitly depended on
+    these deps. This is not true for regular (non-exported) deps.""",
+        default = [],
+        providers = [JavaInfo, KtJvmInfo],
+    ),
+    "neverlink": attr.bool(
+        doc = """If true only use this library for compilation and not at runtime.""",
+        default = False,
+    ),
     "runtime_deps": attr.label_list(
         doc = """Libraries to make available to the final binary or test at runtime only. Like ordinary deps, these will
                        appear on the runtime classpath, but unlike them, not on the compile-time classpath.""",
@@ -66,6 +79,8 @@ def _kt_jvm_library_impl(ctx):
         output_jar = class_jar,
         source_jar = source_jar,
         deps = java_info_deps,
+        neverlink = ctx.attr.neverlink,
+        exports = [e[JavaInfo] for e in ctx.attr.exports],
     )
     return [
         KtJvmInfo(

src/test/starlark/compile/common_tests.bzl

@@ -19,42 +19,49 @@ def _outputs(env, got):
     got_java_info = got_target.provider(JavaInfo, java_info_subject_factory)
     got_java_info.java_outputs().transform(**map_to("class_jar")).contains(env.ctx.file.class_jar)
 
-    want_jars = [
+    want_compile_jars = [
         j
-        for d in env.ctx.attr.transitive_deps
+        for d in env.ctx.attr.transitive_compile_deps
         if JavaInfo in d
         for j in d[JavaInfo].compile_jars.to_list()
     ]
 
-    got_java_info.transitive_compile_time_jars().contains_at_least(want_jars)
+    want_runtime_jars = [
+        j
+        for d in env.ctx.attr.transitive_runtime_deps
+        if JavaInfo in d
+        for j in d[JavaInfo].transitive_runtime_jars.to_list()
+    ]
+
+    got_java_info.transitive_compile_time_jars().contains_exactly([j.short_path for j in want_compile_jars])
+    got_java_info.transitive_runtime_jars().contains_exactly([j.short_path for j in want_runtime_jars])
     got_java_info.source_jars().contains(env.ctx.file.source_jar)
 
     # get actions
     source = got_target.action_generating(env.ctx.file.source_jar.short_path)
 
     compile = got_target.action_generating(env.ctx.file.class_jar.short_path)
-    compile.contains_at_least_inputs(want_jars)
+    compile.contains_at_least_inputs(
+        [i[JavaInfo].compile_jars.to_list() for i in env.ctx.attr.inputs if JavaInfo in i] + env.ctx.files.inputs,
+    )
 
-def test_deps_core_kt_jvm_library(test):
+def _test_neverlink_deps(test, rule_under_test, **kwargs):
     have = test.have(
-        core_kt_jvm_library,
+        rule_under_test,
         name = "have",
-        srcs = [
-            test.artifact("hold.kt"),
-        ],
-        deps = [
-        ],
+        srcs = [test.artifact("hold.kt")],
+        deps = [],
+        neverlink = True,
+        **kwargs
     )
 
+    got_src = test.artifact("gave.kt")
     got = test.got(
-        core_kt_jvm_library,
+        rule_under_test,
         name = "got",
-        srcs = [
-            test.artifact("gave.kt"),
-        ],
-        deps = [
-            have,
-        ],
+        srcs = [got_src],
+        deps = [have],
+        **kwargs
     )
     test.claim(
         got = got,
@@ -68,35 +75,43 @@ def test_deps_core_kt_jvm_library(test):
                 attr = attr.label(allow_single_file = True),
                 value = got + "lib.srcjar",
             ),
-            "transitive_deps": Want(
+            "inputs": Want(
+                attr = attr.label_list(allow_empty = True, allow_files = True),
+                value = [got_src, have + "lib.jar"],
+            ),
+            "transitive_compile_deps": Want(
                 attr = attr.label_list(providers = [[JavaInfo], [KtJvmInfo]]),
-                value = [
-                    have,
-                ],
+                value = [got, have],
+            ),
+            "transitive_runtime_deps": Want(
+                attr = attr.label_list(providers = [[JavaInfo], [KtJvmInfo]]),
+                value = [got],
             ),
         },
     )
 
-def test_deps_core_kt_jvm_binary(test):
+def _test_deps_core(test, rule_under_test, **kwargs):
     have = test.have(
-        core_kt_jvm_binary,
+        rule_under_test,
         name = "have",
         srcs = [
             test.artifact("hold.kt"),
         ],
         deps = [
         ],
+        **kwargs
     )
 
     got = test.got(
-        core_kt_jvm_binary,
+        rule_under_test,
         name = "got",
         srcs = [
             test.artifact("gave.kt"),
         ],
         deps = [
             have,
         ],
+        **kwargs
     )
     test.claim(
         got = got,
@@ -110,53 +125,35 @@ def test_deps_core_kt_jvm_binary(test):
                 attr = attr.label(allow_single_file = True),
                 value = got + "lib.srcjar",
             ),
-            "transitive_deps": Want(
+            "inputs": Want(
+                attr = attr.label_list(allow_empty = True, allow_files = True),
+                value = [have + "lib.jar"],
+            ),
+            "transitive_compile_deps": Want(
                 attr = attr.label_list(providers = [[JavaInfo], [KtJvmInfo]]),
                 value = [
                     have,
+                    got,
                 ],
             ),
-        },
-    )
-
-def test_no_deps_core_kt_jvm_library(test):
-    got = test.got(
-        core_kt_jvm_library,
-        name = "got",
-        srcs = [
-            test.artifact("a.kt"),
-        ],
-        deps = [
-        ],
-    )
-    test.claim(
-        got = got,
-        what = _outputs,
-        wants = {
-            "class_jar": Want(
-                attr = attr.label(allow_single_file = True),
-                value = got + "lib.jar",
-            ),
-            "source_jar": Want(
-                attr = attr.label(allow_single_file = True),
-                value = got + "lib.srcjar",
-            ),
-            "transitive_deps": Want(
+            "transitive_runtime_deps": Want(
                 attr = attr.label_list(providers = [[JavaInfo], [KtJvmInfo]]),
-                value = [],
+                value = [got],
             ),
         },
     )
 
-def test_no_deps_core_kt_jvm_binary(test):
+def test_no_deps_core(test, rule_under_test, **kwargs):
+    have_src = test.artifact("a.kt")
     got = test.got(
-        core_kt_jvm_binary,
+        rule_under_test,
         name = "got",
         srcs = [
-            test.artifact("a.kt"),
+            have_src,
         ],
         deps = [
         ],
+        **kwargs
     )
     test.claim(
         got = got,
@@ -170,16 +167,46 @@ def test_no_deps_core_kt_jvm_binary(test):
                 attr = attr.label(allow_single_file = True),
                 value = got + "lib.srcjar",
             ),
-            "transitive_deps": Want(
+            "transitive_compile_deps": Want(
+                attr = attr.label_list(providers = [[JavaInfo], [KtJvmInfo]]),
+                value = [got],
+            ),
+            "transitive_runtime_deps": Want(
                 attr = attr.label_list(providers = [[JavaInfo], [KtJvmInfo]]),
-                value = [],
+                value = [got],
+            ),
+            "inputs": Want(
+                attr = attr.label_list(allow_empty = True, allow_files = True),
+                value = [have_src],
             ),
         },
     )
 
+def test_deps_core_kt_jvm_binary(test):
+    _test_deps_core(test, core_kt_jvm_binary, main_class = "Foo")
+
+def test_neverlink_deps_core_kt_jvm_binary(test):
+    _test_neverlink_deps(test, core_kt_jvm_binary, main_class = "Foo")
+
+def test_no_deps_core_kt_jvm_binary(test):
+    test_no_deps_core(test, core_kt_jvm_binary, main_class = "Foo")
+
+def test_deps_core_kt_jvm_library(test):
+    _test_deps_core(test, core_kt_jvm_library)
+
+def test_neverlink_deps_core_kt_jvm_library(test):
+    _test_neverlink_deps(test, core_kt_jvm_library)
+
+def test_no_deps_core_kt_jvm_library(test):
+    test_no_deps_core(test, core_kt_jvm_library)
+
 def test_suite(name):
     suite(
         name,
-        test_no_deps_core_kt_jvm_library,
+        test_deps_core_kt_jvm_binary,
         test_deps_core_kt_jvm_library,
+        test_neverlink_deps_core_kt_jvm_library,
+        test_neverlink_deps_core_kt_jvm_binary,
+        test_no_deps_core_kt_jvm_binary,
+        test_no_deps_core_kt_jvm_library,
     )

src/test/starlark/compile/subjects.bzl

@@ -8,5 +8,6 @@ def java_info_subject_factory(value, meta):
             "java_outputs": subjects.collection,
             "source_jars": subjects.collection,
             "transitive_compile_time_jars": subjects.depset_file,
+            "transitive_runtime_jars": subjects.depset_file,
         },
     )