diff options
| author | Liam Miller-Cushon <cushon@google.com> | 2023-10-10 09:07:08 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-10-10 09:07:39 -0700 |
| commit | ad516c65ed9300efbc16d2d4db4dfd83f166792b (patch) | |
| tree | d97cfcb42c1711354feebafde505fd8bac8f4eed | |
| parent | 42895ed5c859cfd96dd5253aa46d462a770db834 (diff) | |
| download | bazelbuild-kotlin-rules-ad516c65ed9300efbc16d2d4db4dfd83f166792b.tar.gz | |
Remove unused attributes
PiperOrigin-RevId: 572268412
Change-Id: I1657bdc02b918665439f4eae4c5dc7c7a89f3fec
| -rw-r--r-- | copy.bara.sky | 2 | ||||
| -rw-r--r-- | toolchains/kotlin_jvm/BUILD | 1 | ||||
| -rw-r--r-- | toolchains/kotlin_jvm/kt_jvm_toolchains.bzl | 21 |
3 files changed, 1 insertions, 23 deletions
diff --git a/copy.bara.sky b/copy.bara.sky index 7ef2a70..6b06180 100644 --- a/copy.bara.sky +++ b/copy.bara.sky @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -908610927
\ No newline at end of file +1644638401
\ No newline at end of file diff --git a/toolchains/kotlin_jvm/BUILD b/toolchains/kotlin_jvm/BUILD index 66056a7..de24049 100644 --- a/toolchains/kotlin_jvm/BUILD +++ b/toolchains/kotlin_jvm/BUILD @@ -55,7 +55,6 @@ toolchain( kt_jvm_toolchains.declare( name = "kt_jvm_toolchain_no_turbine_darwin_jdk", - enable_turbine_direct = False, ) # Turn on profiling of Kotlin/JVM actions diff --git a/toolchains/kotlin_jvm/kt_jvm_toolchains.bzl b/toolchains/kotlin_jvm/kt_jvm_toolchains.bzl index 16f8ac2..42784ac 100644 --- a/toolchains/kotlin_jvm/kt_jvm_toolchains.bzl +++ b/toolchains/kotlin_jvm/kt_jvm_toolchains.bzl @@ -62,9 +62,6 @@ def _kt_jvm_toolchain_impl(ctx): proguard_whitelister = ctx.attr.proguard_whitelister[DefaultInfo].files_to_run, source_jar_zipper = ctx.file.source_jar_zipper, toolchain_type = None if ctx.attr.toolchain_type == None else str(ctx.attr.toolchain_type.label), - turbine = ctx.file.turbine, - turbine_direct = _opt_for_test(ctx.attr.turbine_direct, lambda x: x[DefaultInfo].files_to_run), - turbine_java_runtime = ctx.attr.turbine_java_runtime, # go/keep-sorted end ) return [ @@ -100,11 +97,6 @@ kt_jvm_toolchain = rule( coverage_runtime = attr.label( default = "@maven//:org_jacoco_org_jacoco_agent", ), - enable_turbine_direct = attr.bool( - # If disabled, the value of turbine_direct will be ignored. - # Starlark doesn't allow None to override default-valued attributes: - default = True, - ), genclass = attr.label( default = "@bazel_tools//tools/jdk:GenClass_deploy.jar", cfg = "exec", @@ -188,19 +180,6 @@ kt_jvm_toolchain = rule( cfg = "exec", allow_single_file = [".jar"], ), - turbine = attr.label( - default = "@bazel_tools//tools/jdk:turbine_direct", - cfg = "exec", - allow_single_file = True, - ), - turbine_direct = attr.label( - executable = True, - cfg = "exec", - allow_single_file = True, - ), - turbine_java_runtime = attr.label( - cfg = "exec", - ), toolchain_type = attr.label(), ), provides = [platform_common.ToolchainInfo], |