From 4e0c735816d622166bb9161a00e9dac63a96d3da Mon Sep 17 00:00:00 2001 From: Ilia Kirianovskii Date: Thu, 25 Sep 2025 12:37:26 +0200 Subject: [PATCH] [rules_jvm] Support x_x_language attribute (of type string_list) in kt_kotlinc_options rule (KTIJ-35250) GitOrigin-RevId: 04536d57a4e845cdf88d7e388b220b48ef76e20e --- build/jvm-rules/rules/impl/kotlinc-options.bzl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build/jvm-rules/rules/impl/kotlinc-options.bzl b/build/jvm-rules/rules/impl/kotlinc-options.bzl index 2e8241e1df31..0f0f294c4f44 100644 --- a/build/jvm-rules/rules/impl/kotlinc-options.bzl +++ b/build/jvm-rules/rules/impl/kotlinc-options.bzl @@ -47,6 +47,9 @@ def _map_plugins_optins_to_flag(values): result += ["-P", v] return result +def _map_x_x_language_to_flag(values): + return ["-XXLanguage:%s" % v for v in values] + _KOPTS = { # "jvm_default": struct( # flag = "-jvm-default", @@ -323,15 +326,12 @@ _KOPTS = { ), "x_x_language" :struct( args = dict( - default = "", - doc = "Language compatibility flags", - values = ["", "+InlineClasses"], + default = [], + doc = "Language compatibility flags.", ), - type = attr.string, - value_to_flag = { - "+InlineClasses": ["-XXLanguage:+InlineClasses"], - "": None, - }, + type = attr.string_list, + value_to_flag = None, + map_value_to_flag = _map_x_x_language_to_flag, ), }