Skip to content

Commit bc90033

Browse files
authored
[options] Add exports and fix readme (#1068)
* [options] Add exports and fix readme * Update docs
1 parent b7a2484 commit bc90033

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,13 +203,13 @@ load("@rules_kotlin//kotlin:core.bzl", "kt_kotlinc_options", "kt_javac_options",
203203

204204
kt_kotlinc_options(
205205
name = "kt_kotlinc_options",
206-
kotlinc_opts = ["-Xno-param-assertions"],
206+
x_no_param_assertions = True,
207207
jvm_target = "1.8",
208208
)
209209

210210
kt_javac_options(
211211
name = "kt_javac_options",
212-
javac_opts = ["-nowarn"],
212+
warn = "off",
213213
)
214214

215215
define_kt_toolchain(
@@ -230,16 +230,16 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
230230

231231
kt_kotlinc_options(
232232
name = "kt_kotlinc_options_for_package_name",
233-
kotlinc_opts = [
234-
"-Xno-param-assertions",
235-
"-Xopt-in=kotlin.Experimental",
236-
"-Xopt-in=kotlin.ExperimentalStdlibApi",
233+
x_no_param_assertions = True,
234+
x_optin = [
235+
"kotlin.Experimental",
236+
"kotlin.ExperimentalStdlibApi",
237237
],
238238
)
239239

240240
kt_javac_options(
241241
name = "kt_javac_options_for_package_name",
242-
javac_opts = ["-nowarn"],
242+
warn = "off"
243243
)
244244

245245
kt_jvm_library(

docs/kotlin.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ kt_js_library(<a href="#kt_js_library-name">name</a>, <a href="#kt_js_library-kw
4848

4949
## kt_javac_options
5050

51-
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>,
52-
<a href="#kt_javac_options-xd_suppress_notes">xd_suppress_notes</a>)
51+
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>,
52+
<a href="#kt_javac_options-x_lint">x_lint</a>, <a href="#kt_javac_options-xd_suppress_notes">xd_suppress_notes</a>)
5353

5454
5555
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
6161
| Name | Description | Type | Mandatory | Default |
6262
| :------------- | :------------- | :------------- | :------------- | :------------- |
6363
|<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 | |
64+
|<a id="kt_javac_options-add_exports"></a>add_exports | Export internal jdk apis | List of strings | optional | [] |
6465
|<a id="kt_javac_options-release"></a>release | Compile for the specified Java SE release | String | optional | "default" |
6566
|<a id="kt_javac_options-warn"></a>warn | Control warning behaviour. | String | optional | "report" |
6667
|<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
369370

370371
## kt_javac_options
371372

372-
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>,
373-
<a href="#kt_javac_options-xd_suppress_notes">xd_suppress_notes</a>)
373+
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>,
374+
<a href="#kt_javac_options-x_lint">x_lint</a>, <a href="#kt_javac_options-xd_suppress_notes">xd_suppress_notes</a>)
374375

375376
376377
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
382383
| Name | Description | Type | Mandatory | Default |
383384
| :------------- | :------------- | :------------- | :------------- | :------------- |
384385
|<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 | |
386+
|<a id="kt_javac_options-add_exports"></a>add_exports | Export internal jdk apis | List of strings | optional | [] |
385387
|<a id="kt_javac_options-release"></a>release | Compile for the specified Java SE release | String | optional | "default" |
386388
|<a id="kt_javac_options-warn"></a>warn | Control warning behaviour. | String | optional | "report" |
387389
|<a id="kt_javac_options-x_ep_disable_all_checks"></a>x_ep_disable_all_checks | See javac -XepDisableAllChecks documentation | Boolean | optional | False |

src/main/starlark/core/options/opts.javac.bzl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,16 @@ _JOPTS = {
8787
"strict": ["-Xexplicit-api=strict"],
8888
},
8989
),
90+
"add_exports": struct(
91+
args = dict(
92+
default = [],
93+
doc = "Export internal jdk apis ",
94+
),
95+
type = attr.string_list,
96+
value_to_flag = {
97+
derive.info: derive.repeated_values_for("--add-exports="),
98+
},
99+
),
90100
}
91101

92102
def _javac_options_impl(ctx):

0 commit comments

Comments
 (0)