From f28fbbb9c5455f64505420a25cd538c145bb34bd Mon Sep 17 00:00:00 2001
From: Corbin McNeely-Smith <restingbull@mcneely-smith.com>
Date: Fri, 3 Nov 2023 14:59:39 -0500
Subject: [PATCH] [options] Add exports and fix readme
---
README.md | 14 +++++++-------
src/main/starlark/core/options/opts.javac.bzl | 10 ++++++++++
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index 15f7ab913..7853aeb1d 100644
--- 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/src/main/starlark/core/options/opts.javac.bzl b/src/main/starlark/core/options/opts.javac.bzl
index bfad8c8a5..acf6f24fa 100644
--- a/src/main/starlark/core/options/opts.javac.bzl
+++ b/src/main/starlark/core/options/opts.javac.bzl
@@ -72,6 +72,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):