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

Option to tag a rule as kt_abi_plugin_incompatible #362

Merged
merged 2 commits into from
Nov 18, 2020
Merged

Option to tag a rule as kt_abi_plugin_incompatible #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
269a928
Add toolchain parameter to control new flow using JavaBuilder
jongerrish Nov 8, 2020
3f9553b
Add `kt_abi_plugin_incompatible` tag to opt-out incompatible targets
jongerrish Nov 16, 2020
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
2 changes: 1 addition & 1 deletion kotlin/internal/jvm/compile.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ def _run_kt_java_builder_actions(ctx, rule_kind, toolchains, srcs, generated_src
# Build Kotlin
if srcs.kt or srcs.src_jars:
kt_runtime_jar = ctx.actions.declare_file(ctx.label.name + "-kt.jar")
if toolchains.kt.experimental_use_abi_jars:
if toolchains.kt.experimental_use_abi_jars and not "kt_abi_plugin_incompatible" in ctx.attr.tags:
kt_compile_jar = ctx.actions.declare_file(ctx.label.name + "-kt.abi.jar")
outputs = {
"output": kt_runtime_jar,
Expand Down
3 changes: 2 additions & 1 deletion kotlin/internal/toolchains.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ _kt_toolchain = rule(
providers = [_KtJsInfo],
),
"experimental_use_abi_jars": attr.bool(
doc = "Compile using abi jars, requires experimental_use_java_builder",
doc = """Compile using abi jars, requires experimental_use_java_builder. Can be disabled
for an individual target using the tag `kt_abi_plugin_incompatible`""",
default = False,
),
"experimental_use_java_builder" : attr.bool(
Expand Down