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

'experimental_use_abi_jars' toolchain attribute cleanup #733

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

'experimental_use_abi_jars' toolchain attribute cleanup #733

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
3 changes: 1 addition & 2 deletions docs/kotlin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ kt_kotlinc_options(<a href="#kt_kotlinc_options-name">name</a>, <a href="#kt_kot
## define_kt_toolchain

<pre>
define_kt_toolchain(<a href="#define_kt_toolchain-name">name</a>, <a href="#define_kt_toolchain-language_version">language_version</a>, <a href="#define_kt_toolchain-api_version">api_version</a>, <a href="#define_kt_toolchain-jvm_target">jvm_target</a>, <a href="#define_kt_toolchain-experimental_use_abi_jars">experimental_use_abi_jars</a>,
define_kt_toolchain(<a href="#define_kt_toolchain-name">name</a>, <a href="#define_kt_toolchain-language_version">language_version</a>, <a href="#define_kt_toolchain-api_version">api_version</a>, <a href="#define_kt_toolchain-jvm_target">jvm_target</a>,
<a href="#define_kt_toolchain-experimental_strict_kotlin_deps">experimental_strict_kotlin_deps</a>, <a href="#define_kt_toolchain-experimental_report_unused_deps">experimental_report_unused_deps</a>,
<a href="#define_kt_toolchain-experimental_reduce_classpath_mode">experimental_reduce_classpath_mode</a>, <a href="#define_kt_toolchain-experimental_multiplex_workers">experimental_multiplex_workers</a>, <a href="#define_kt_toolchain-javac_options">javac_options</a>,
<a href="#define_kt_toolchain-kotlinc_options">kotlinc_options</a>, <a href="#define_kt_toolchain-jacocorunner">jacocorunner</a>)
Expand All @@ -433,7 +433,6 @@ Define the Kotlin toolchain.
| language_version | <p align="center"> - </p> | <code>None</code> |
| api_version | <p align="center"> - </p> | <code>None</code> |
| jvm_target | <p align="center"> - </p> | <code>None</code> |
| experimental_use_abi_jars | <p align="center"> - </p> | <code>False</code> |
| experimental_strict_kotlin_deps | <p align="center"> - </p> | <code>None</code> |
| experimental_report_unused_deps | <p align="center"> - </p> | <code>None</code> |
| experimental_reduce_classpath_mode | <p align="center"> - </p> | <code>None</code> |
Expand Down
1 change: 0 additions & 1 deletion examples/android/bzl/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ define_kt_toolchain(
# experimental_reduce_classpath_mode = "KOTLINBUILDER_REDUCED",
experimental_report_unused_deps = "warn",
experimental_strict_kotlin_deps = "warn",
experimental_use_abi_jars = True,
javac_options = ":default_javac_options",
kotlinc_options = ":default_kotlinc_options",
language_version = "1.5",
Expand Down
1 change: 0 additions & 1 deletion examples/jetpack_compose/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ kt_javac_options(
define_kt_toolchain(
name = "kotlin_toolchain",
api_version = "1.6",
experimental_use_abi_jars = False,
javac_options = "//:kt_javac_options",
jvm_target = "1.8",
kotlinc_options = "//:kt_kotlinc_options",
Expand Down
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 @@ -597,7 +597,7 @@ def _run_kt_java_builder_actions(
if srcs.kt or srcs.src_jars:
kt_runtime_jar = ctx.actions.declare_file(ctx.label.name + "-kt.jar")
kt_jdeps = ctx.actions.declare_file(ctx.label.name + "-kt.jdeps")
if not "kt_abi_plugin_incompatible" in ctx.attr.tags and toolchains.kt.experimental_use_abi_jars == True:
if 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
21 changes: 0 additions & 21 deletions kotlin/internal/toolchains.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ def _kotlin_toolchain_impl(ctx):
"supports-workers": "1",
"supports-multiplex-workers": "1" if ctx.attr.experimental_multiplex_workers else "0",
},
experimental_use_abi_jars = ctx.attr.experimental_use_abi_jars,
experimental_strict_kotlin_deps = ctx.attr.experimental_strict_kotlin_deps,
experimental_report_unused_deps = ctx.attr.experimental_report_unused_deps,
experimental_reduce_classpath_mode = ctx.attr.experimental_reduce_classpath_mode,
Expand Down Expand Up @@ -203,11 +202,6 @@ _kt_toolchain = rule(
doc = """Run workers in multiplex mode.""",
default = False,
),
"experimental_use_abi_jars": attr.bool(
doc = """Compile using abi jars. Can be disabled for an individual target using the tag
`kt_abi_plugin_incompatible`""",
default = False,
),
"experimental_strict_kotlin_deps": attr.string(
doc = "Report strict deps violations",
default = "off",
Expand Down Expand Up @@ -271,7 +265,6 @@ def define_kt_toolchain(
language_version = None,
api_version = None,
jvm_target = None,
experimental_use_abi_jars = False,
experimental_strict_kotlin_deps = None,
experimental_report_unused_deps = None,
experimental_reduce_classpath_mode = None,
Expand All @@ -296,11 +289,6 @@ def define_kt_toolchain(
absolute_target("//kotlin/internal:builder_debug_timings"): ["timings"],
"//conditions:default": [],
}),
experimental_use_abi_jars = select({
absolute_target("//kotlin/internal:experimental_use_abi_jars"): True,
absolute_target("//kotlin/internal:noexperimental_use_abi_jars"): False,
"//conditions:default": experimental_use_abi_jars,
}),
experimental_multiplex_workers = experimental_multiplex_workers,
experimental_strict_kotlin_deps = experimental_strict_kotlin_deps,
experimental_report_unused_deps = experimental_report_unused_deps,
Expand Down Expand Up @@ -336,15 +324,6 @@ def kt_configure_toolchains():
visibility = ["//visibility:public"],
)

native.config_setting(
name = "experimental_use_abi_jars",
values = {"define": "experimental_use_abi_jars=1"},
)
native.config_setting(
name = "noexperimental_use_abi_jars",
values = {"define": "experimental_use_abi_jars=0"},
)

native.config_setting(
name = "builder_debug_timings",
values = {"define": "kt_timings=1"},
Expand Down