More clean up

Author: Bencodes

kotlin/internal/jvm/impl.bzl

@@ -137,9 +137,6 @@ def _write_launcher_action(ctx, rjars, main_class, jvm_flags):
     )
     return []
 
-# Exposed for kt_android_* rules
-write_launcher_action_exposed = _write_launcher_action
-
 # buildifier: disable=unused-variable
 def _is_source_jar_stub(jar):
     """Workaround for intellij plugin expecting a source jar"""

kotlin/internal/jvm/jvm.bzl

@@ -661,9 +661,7 @@ kt_plugin_cfg = rule(
     },
 )
 
-#
-# Exposed for kt_android_* rules.
-#
-lib_common_attr_exposed = _lib_common_attr
-runnable_common_attr_exposed = _runnable_common_attr
-common_outputs_exposed = _common_outputs
+attrs = struct(
+    lib_common_attr = _lib_common_attr,
+    runnable_common_attr = _runnable_common_attr,
+)

kotlin/internal/jvm/kt_android_library.bzl

@@ -26,7 +26,7 @@ load(
 )
 load(
     "//kotlin/internal/jvm:jvm.bzl",
-    _lib_common_attr_exposed = "lib_common_attr_exposed",
+    _attrs = "attrs",
 )
 load(
     "//kotlin/internal/jvm:kt_android_library_impl.bzl",
@@ -37,7 +37,7 @@ load(
     _utils = "utils",
 )
 
-_ATTRS = _utils.add_dicts(_BASE_ATTRS, _lib_common_attr_exposed, {
+_ATTRS = _utils.add_dicts(_BASE_ATTRS, _attrs.lib_common_attr, {
 })
 
 kt_android_library = _make_rule(

kotlin/internal/jvm/kt_android_local_test.bzl

@@ -28,8 +28,7 @@ load(
 )
 load(
     "//kotlin/internal/jvm:jvm.bzl",
-    _lib_common_attr_exposed = "lib_common_attr_exposed",
-    _runnable_common_attr_exposed = "runnable_common_attr_exposed",
+    _attrs = "attrs",
 )
 load(
     "//kotlin/internal/jvm:kt_android_local_test_impl.bzl",
@@ -40,7 +39,7 @@ load(
     _utils = "utils",
 )
 
-_ATTRS = _utils.add_dicts(_BASE_ATTRS, _runnable_common_attr_exposed, {
+_ATTRS = _utils.add_dicts(_BASE_ATTRS, _attrs.runnable_common_attr, {
     "main_class": attr.string(default = "com.google.testing.junit.runner.BazelTestRunner"),
     "jacocorunner": attr.label(
         default = Label("@bazel_tools//tools/jdk:JacocoCoverage"),