Several small fixes for previous PR #383 (#385)

bazelbuild · Nov 11, 2020 · 83a26dc · 83a26dc
1 parent 54c5ec8
commit 83a26dc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/kotlin/internal/BUILD b/kotlin/internal/BUILD
@@ -18,10 +18,12 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
 kt_kotlinc_options(
     name = "default_kotlinc_options",
+    visibility = ["//visibility:public"],
 )
 
 kt_javac_options(
     name = "default_javac_options",
+    visibility = ["//visibility:public"],
 )
 
 # Configures the toolchains

diff --git a/kotlin/internal/jvm/compile.bzl b/kotlin/internal/jvm/compile.bzl
@@ -269,7 +269,7 @@ def kt_jvm_compile_action(ctx, rule_kind, output_jar, compile_jar):
                 output = java_compile_jar,
                 deps = compile_deps.deps + [JavaInfo(compile_jar = kt_compile_jar, output_jar = kt_compile_jar)],
                 java_toolchain = toolchains.java,
-                javac_opts = toolchains.kt.javac_opts,
+                javac_opts = _javac_options_provider_to_flags(toolchains.kt.javac_options),
                 host_javabase = toolchains.java_runtime,
             )
             compile_jar = ctx.actions.declare_file(ctx.label.name + ".abi.jar")

diff --git a/kotlin/internal/opts.bzl b/kotlin/internal/opts.bzl
@@ -39,7 +39,7 @@ KotlincOptions = provider(
 def _kotlinc_options_impl(ctx):
     return struct(
         providers = [
-            KotlincOptions(**{n: getattr(ctx, n, None) for n in _KOPTS}),
+            KotlincOptions(**{n: getattr(ctx.attr, n, None) for n in _KOPTS}),
         ],
     )
 
@@ -94,7 +94,7 @@ JavacOptions = provider(
 def _javac_options_impl(ctx):
     return struct(
         providers = [
-            JavacOptions(**{n: getattr(ctx, n, None) for n in _JOPTS}),
+            JavacOptions(**{n: getattr(ctx.attr, n, None) for n in _JOPTS}),
         ],
     )