[options] Add exports and fix readme (#1068)

* [options] Add exports and fix readme * Update docs
bazelbuild · Nov 10, 2023 · bc90033 · bc90033
1 parent b7a2484
commit bc90033
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -203,13 +203,13 @@ load("@rules_kotlin//kotlin:core.bzl", "kt_kotlinc_options", "kt_javac_options",
 
 kt_kotlinc_options(
     name = "kt_kotlinc_options",
-    kotlinc_opts = ["-Xno-param-assertions"],
+    x_no_param_assertions = True,
     jvm_target = "1.8",
 )
 
 kt_javac_options(
     name = "kt_javac_options",
-    javac_opts = ["-nowarn"],
+    warn = "off",
 )
 
 define_kt_toolchain(
@@ -230,16 +230,16 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
 
 kt_kotlinc_options(
     name = "kt_kotlinc_options_for_package_name",
-    kotlinc_opts = [
-     "-Xno-param-assertions",
-     "-Xopt-in=kotlin.Experimental",
-     "-Xopt-in=kotlin.ExperimentalStdlibApi",
+    x_no_param_assertions = True,
+    x_optin = [
+        "kotlin.Experimental",
+        "kotlin.ExperimentalStdlibApi",
     ],
 )
 
 kt_javac_options(
     name = "kt_javac_options_for_package_name",
-    javac_opts = ["-nowarn"],
+    warn = "off"
 )
 
 kt_jvm_library(

diff --git a/docs/kotlin.md b/docs/kotlin.md
@@ -48,8 +48,8 @@ kt_js_library(<a href="#kt_js_library-name">name</a>, <a href="#kt_js_library-kw
 
 ## kt_javac_options
 
-kt_javac_options(<a href="#kt_javac_options-name">name</a>, <a href="#kt_javac_options-release">release</a>, <a href="#kt_javac_options-warn">warn</a>, <a href="#kt_javac_options-x_ep_disable_all_checks">x_ep_disable_all_checks</a>, <a href="#kt_javac_options-x_explicit_api_mode">x_explicit_api_mode</a>, <a href="#kt_javac_options-x_lint">x_lint</a>,
-                 <a href="#kt_javac_options-xd_suppress_notes">xd_suppress_notes</a>)
+kt_javac_options(<a href="#kt_javac_options-name">name</a>, <a href="#kt_javac_options-add_exports">add_exports</a>, <a href="#kt_javac_options-release">release</a>, <a href="#kt_javac_options-warn">warn</a>, <a href="#kt_javac_options-x_ep_disable_all_checks">x_ep_disable_all_checks</a>, <a href="#kt_javac_options-x_explicit_api_mode">x_explicit_api_mode</a>,
+                 <a href="#kt_javac_options-x_lint">x_lint</a>, <a href="#kt_javac_options-xd_suppress_notes">xd_suppress_notes</a>)
 
                                                                                                 
     Define java compiler options for `kt_jvm_*` rules with java sources.
@@ -61,6 +61,7 @@ kt_javac_options(<a href="#kt_javac_options-name">name</a>, <a href="#kt_javac_o
 | Name  | Description | Type | Mandatory | Default |
 | :------------- | :------------- | :------------- | :------------- | :------------- |
 |<a id="kt_javac_options-name"></a>name |  A unique name for this target.   | <a href="https://bazel.build/concepts/labels#target-names">Name</a> | required |  |
+|<a id="kt_javac_options-add_exports"></a>add_exports |  Export internal jdk apis   | List of strings | optional | [] |
 |<a id="kt_javac_options-release"></a>release |  Compile for the specified Java SE release   | String | optional | "default" |
 |<a id="kt_javac_options-warn"></a>warn |  Control warning behaviour.   | String | optional | "report" |
 |<a id="kt_javac_options-x_ep_disable_all_checks"></a>x_ep_disable_all_checks |  See javac -XepDisableAllChecks documentation   | Boolean | optional | False |
@@ -369,8 +370,8 @@ kt_compiler_plugin(<a href="#kt_compiler_plugin-name">name</a>, <a href="#kt_com
 
 ## kt_javac_options
 
-kt_javac_options(<a href="#kt_javac_options-name">name</a>, <a href="#kt_javac_options-release">release</a>, <a href="#kt_javac_options-warn">warn</a>, <a href="#kt_javac_options-x_ep_disable_all_checks">x_ep_disable_all_checks</a>, <a href="#kt_javac_options-x_explicit_api_mode">x_explicit_api_mode</a>, <a href="#kt_javac_options-x_lint">x_lint</a>,
-                 <a href="#kt_javac_options-xd_suppress_notes">xd_suppress_notes</a>)
+kt_javac_options(<a href="#kt_javac_options-name">name</a>, <a href="#kt_javac_options-add_exports">add_exports</a>, <a href="#kt_javac_options-release">release</a>, <a href="#kt_javac_options-warn">warn</a>, <a href="#kt_javac_options-x_ep_disable_all_checks">x_ep_disable_all_checks</a>, <a href="#kt_javac_options-x_explicit_api_mode">x_explicit_api_mode</a>,
+                 <a href="#kt_javac_options-x_lint">x_lint</a>, <a href="#kt_javac_options-xd_suppress_notes">xd_suppress_notes</a>)
 
                                                                                                 
     Define java compiler options for `kt_jvm_*` rules with java sources.
@@ -382,6 +383,7 @@ kt_javac_options(<a href="#kt_javac_options-name">name</a>, <a href="#kt_javac_o
 | Name  | Description | Type | Mandatory | Default |
 | :------------- | :------------- | :------------- | :------------- | :------------- |
 |<a id="kt_javac_options-name"></a>name |  A unique name for this target.   | <a href="https://bazel.build/concepts/labels#target-names">Name</a> | required |  |
+|<a id="kt_javac_options-add_exports"></a>add_exports |  Export internal jdk apis   | List of strings | optional | [] |
 |<a id="kt_javac_options-release"></a>release |  Compile for the specified Java SE release   | String | optional | "default" |
 |<a id="kt_javac_options-warn"></a>warn |  Control warning behaviour.   | String | optional | "report" |
 |<a id="kt_javac_options-x_ep_disable_all_checks"></a>x_ep_disable_all_checks |  See javac -XepDisableAllChecks documentation   | Boolean | optional | False |

diff --git a/src/main/starlark/core/options/opts.javac.bzl b/src/main/starlark/core/options/opts.javac.bzl
@@ -87,6 +87,16 @@ _JOPTS = {
             "strict": ["-Xexplicit-api=strict"],
         },
     ),
+    "add_exports": struct(
+        args = dict(
+            default = [],
+            doc = "Export internal jdk apis ",
+        ),
+        type = attr.string_list,
+        value_to_flag = {
+            derive.info: derive.repeated_values_for("--add-exports="),
+        },
+    ),
 }
 
 def _javac_options_impl(ctx):