Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support testing with coverage in dev mode #1199

Merged
merged 1 commit into from
Jul 17, 2024
Merged

Support testing with coverage in dev mode #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/main/kotlin/bootstrap.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def kt_bootstrap_library(name, deps = [], neverlink_deps = [], srcs = [], visibi
def kt_bootstrap_binary(
name,
main_class,
runtime_library,
runtime_deps,
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renamed this to align better with what java_binary and the rest of the java rules use.

shade_rules,
jvm_flags = [],
data = [],
Expand All @@ -68,7 +68,7 @@ def kt_bootstrap_binary(
java_binary(
name = raw,
create_executable = False,
runtime_deps = [runtime_library],
runtime_deps = runtime_deps,
)

# Shaded to ensure that libraries it uses are not leaked to
Expand Down
7 changes: 5 additions & 2 deletions src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,12 @@ kt_bootstrap_binary(
"-XX:-MaxFDLimit",
],
main_class = "io.bazel.kotlin.builder.cmd.Build",
runtime_library = ":build_lib",
shade_rules = "//src/main/kotlin:shade.jarjar",
visibility = ["//src:__subpackages__"],
runtime_deps = [
":build_lib",
"@bazel_tools//tools/jdk:JacocoCoverage",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the actual fix. The BUILD.bazel version of this file has this included as a runtime dependency already.

],
)

kt_bootstrap_library(
Expand All @@ -60,7 +63,7 @@ kt_bootstrap_binary(
name = "merge_jdeps",
data = [],
main_class = "io.bazel.kotlin.builder.cmd.MergeJdeps",
runtime_library = ":merge_jdeps_lib",
shade_rules = "//src/main/kotlin:shade.jarjar",
visibility = ["//src:__subpackages__"],
runtime_deps = [":merge_jdeps_lib"],
)