Support for ksp_options

Author: Bencodes

examples/ksp/BUILD

@@ -93,6 +93,10 @@ kt_jvm_library(
         ":tea_lib_src",
         ":chai_lib_src",
     ],
+    ksp_opts = {
+        "arg1": "value1",
+        "arg2": "value2",
+    },
     plugins = [
         "//third_party:dagger_ksp_plugin",
         "//third_party:moshi-kotlin-codegen",

kotlin/internal/jvm/compile.bzl

@@ -525,7 +525,7 @@ def _run_kt_builder_action(
     """Creates a KotlinBuilder action invocation."""
     kotlinc_options = ctx.attr.kotlinc_opts[KotlincOptions] if ctx.attr.kotlinc_opts else toolchains.kt.kotlinc_options
     javac_options = ctx.attr.javac_opts[JavacOptions] if ctx.attr.javac_opts else toolchains.kt.javac_options
-
+    ksp_opts = ctx.attr.ksp_opts if ctx.attr.ksp_opts else None
     args = _utils.init_args(ctx, rule_kind, associates.module_name, kotlinc_options)
 
     for f, path in outputs.items():
@@ -587,6 +587,12 @@ def _run_kt_builder_action(
         omit_if_empty = True,
     )
 
+    if ksp_opts:
+        args.add_all(
+            "--ksp_opts",
+            _utils.dic_to_option_list(ksp_opts),
+        )
+
     args.add("--build_kotlin", build_kotlin)
 
     progress_message = "%s %%{label} { kt: %d, java: %d, srcjars: %d } for %s" % (
@@ -984,10 +990,10 @@ def _run_kt_java_builder_actions(
             )
 
     annotation_processing = None
-    if annotation_processors:
+    if annotation_processors or ksp_annotation_processors:
         outputs_list = [java_info.outputs for java_info in java_infos]
         annotation_processing = _create_annotation_processing(
-            annotation_processors = annotation_processors,
+            annotation_processors = annotation_processors or ksp_annotation_processors,
             ap_class_jar = [jars.class_jar for outputs in outputs_list for jars in outputs.jars][0],
             ap_source_jar = ap_generated_src_jar,
         )

kotlin/internal/jvm/jvm.bzl

@@ -253,6 +253,11 @@ _common_attr = utils.add_dicts(
             Transitive deps required for compilation must be explicitly added""",
             default = Label("//kotlin/settings:experimental_prune_transitive_deps"),
         ),
+        "ksp_opts": attr.string_dict(
+            doc = """KSP processor options to be used when compiling this target.""",
+            default = {},
+            mandatory = False,
+        ),
         "_use_auto_exec_groups": attr.bool(default = False),
     },
 )

kotlin/internal/utils/utils.bzl

@@ -75,10 +75,18 @@ def _builder_workspace_name(ctx):
         lbl = ctx.workspace_name
     return lbl.replace("external/", "")
 
+def _dic_to_option_list(dic):
+    """Converts a dictionary to a list of options in the form of `key=value`"""
+    options = []
+    for key, value in dic.items():
+        options.append(key + "=" + value)
+    return options
+
 utils = struct(
     add_dicts = _add_dicts,
     init_args = _init_builder_args,
     restore_label = _restore_label,
     derive_module_name = _derive_module_name,
     builder_workspace_name = _builder_workspace_name,
+    dic_to_option_list = _dic_to_option_list,
 )

kotlin/settings/BUILD.bazel

@@ -1,18 +1,4 @@
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
-
-# Copyright 2020 The Bazel Authors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 load("//src/main/starlark/release:packager.bzl", "release_archive")
 
 release_archive(