Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions kotlin/internal/jvm/compile.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -878,13 +878,14 @@ def _run_kt_java_builder_actions(
strict_deps = toolchains.kt.experimental_strict_kotlin_deps,
)
ap_generated_src_jar = java_info.annotation_processing.source_jar
java_outputs = java_info.java_outputs if hasattr(java_info, "java_outputs") else java_info.outputs.jars
compile_jars = compile_jars + [
jars.ijar
for jars in java_info.outputs.jars
for jars in java_outputs
]
output_jars = output_jars + [
jars.class_jar
for jars in java_info.outputs.jars
for jars in java_outputs
]
java_infos.append(java_info)

Expand Down
17 changes: 10 additions & 7 deletions kotlin/internal/jvm/impl.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ load("//third_party:jarjar.bzl", "jarjar_action")
def _is_absolute(path):
return path.startswith("/") or (len(path) > 2 and path[1] == ":")

def _make_providers(ctx, providers, transitive_files = depset(order = "default"), *additional_providers):
def _make_providers(ctx, providers, runfiles_targets, transitive_files = depset(order = "default"), *additional_providers):
files = [ctx.outputs.jar]
if providers.java.outputs.jdeps:
files.append(providers.java.outputs.jdeps)
Expand All @@ -48,13 +48,13 @@ def _make_providers(ctx, providers, transitive_files = depset(order = "default")
DefaultInfo(
files = depset(files),
runfiles = ctx.runfiles(
# 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([
d[DefaultInfo].default_runfiles
for d in runfiles_targets
if DefaultInfo in d and d[DefaultInfo].default_runfiles
]),
),
] + list(additional_providers)

Expand Down Expand Up @@ -230,6 +230,7 @@ def kt_jvm_library_impl(ctx):
outputs = ctx.outputs,
attr = ctx.attr,
),
runfiles_targets = ctx.attr.deps + ctx.attr.exports,
)

def kt_jvm_binary_impl(ctx):
Expand All @@ -250,7 +251,8 @@ def kt_jvm_binary_impl(ctx):
return _make_providers(
ctx,
providers,
depset(
runfiles_targets = ctx.attr.deps,
transitive_files = depset(
order = "default",
transitive = [providers.java.transitive_runtime_jars],
direct = ctx.files._java_runtime,
Expand Down Expand Up @@ -306,6 +308,7 @@ def kt_jvm_junit_test_impl(ctx):
return _make_providers(
ctx,
providers,
ctx.attr.deps,
depset(
order = "default",
transitive = [runtime_jars, depset(coverage_runfiles), depset(coverage_metadata)],
Expand Down
4 changes: 3 additions & 1 deletion src/main/starlark/core/compile/cli/toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ KotlincJvmCompileInfo = provider(
},
)

COMPILE_MNEMONIC = "CliKotlinc"

def _cli_toolchain(ctx):
java_runtime = ctx.toolchains[JAVA_RUNTIME_TOOLCHAIN_TYPE].java_runtime
java_toolchain = ctx.toolchains[JAVA_TOOLCHAIN_TYPE].java
Expand All @@ -28,7 +30,7 @@ def _cli_toolchain(ctx):
language_version = ".".join(ctx.attr.api_version.split(".")[:2]),
executable_zip = ctx.attr.zip[DefaultInfo].files_to_run,
kotlinc = ctx.attr.kotlinc[DefaultInfo].files_to_run,
compile_mnemonic = "CliKotlinc",
compile_mnemonic = COMPILE_MNEMONIC,
single_jar = java_toolchain.single_jar,
java_stub_template = ctx.files.java_stub_template[0],
java_runtime = java_runtime,
Expand Down
2 changes: 1 addition & 1 deletion src/main/starlark/core/compile/rules.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def _kt_jvm_library_impl(ctx):
files = ctx.files.data,
).merge_all([
d[DefaultInfo].default_runfiles
for d in ctx.attr.deps
for d in ctx.attr.deps + ctx.attr.exports
if DefaultInfo in d
]),
),
Expand Down
6 changes: 2 additions & 4 deletions src/test/starlark/case.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,9 @@ def case(namespace):
claim = lambda **kwargs: _claim(name = namespace, **kwargs),
)

def suite(name, *tests):
def suite(name, **tests):
test_targets = []
for test in tests:
test_name = str(test).split(" ")[1]
test_targets.append(":" + test_name)
for test_name, test in tests.items():
test(case(test_name))

native.test_suite(
Expand Down
4 changes: 2 additions & 2 deletions src/test/starlark/compile/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load(":common_tests.bzl", "test_suite")
load(":rule_tests.bzl", "test_suite")

test_suite(
name = "common_tests",
name = "rules_tests",
)
212 changes: 0 additions & 212 deletions src/test/starlark/compile/common_tests.bzl

This file was deleted.

Loading