From c7dee10dc9460210283d758b2b0232e238a867a6 Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Thu, 22 Dec 2022 13:37:08 +0100
Subject: [PATCH] Decouple Kotlin compiler from Kotlin rules

Move Kotlin specific targets (like `kt_jvm_import`) from `BUILD.com_github_jetbrains_kotlin` to `//kotlin/compiler`.

This will make it possible to release `kotlin-compiler` module on `bazel-central-registry` without depending on `rules_kotlin`. The release will contain the new form `BUILD.com_github_jetbrains_kotlin` which doesn't depend on `rules_kotlin`.

RELNOTES[INC]: This breaks users that depend on `@com_github_jetbrains_kotlin//:*` targets. The same targets can be found under  `@io_bazel_rules_kotlin//kotlin/compiler:*`.

It's not possible to add an `alias` to `@com_github_jetbrains_kotlin` repository, becuase it would already create a dependency on `rules_kotlin` repository in the bzlmod world.

Technically it's possible to release 2 bzlmod modules that have a circular dependency. But this might create some unexpected problems. It addition it would be harder to convince `com_github_jetbrains_kotlin` owners to depend on `rules_kotlin`.

Works toward: https://github.com/bazelbuild/rules_kotlin/issues/660
---
 README.md                                     |   2 +-
 docs/kotlin.md                                |   4 +-
 examples/android/libKtAndroid/BUILD.bazel     |   2 +-
 examples/plugin/src/allopen/BUILD             |   2 +-
 examples/plugin/src/allopennoarg/BUILD        |   6 +-
 examples/plugin/src/noarg/BUILD               |   4 +-
 examples/plugin/src/parcelize/BUILD           |   4 +-
 examples/plugin/src/sam_with_receiver/BUILD   |   2 +-
 examples/plugin/src/serialization/BUILD       |   2 +-
 kotlin/BUILD                                  |   1 +
 kotlin/compiler/BUILD                         |  28 ++++
 kotlin/compiler/BUILD.release.bazel           |  19 +++
 kotlin/compiler/compiler.bzl                  | 127 ++++++++++++++++++
 kotlin/internal/js/js.bzl                     |   6 +-
 kotlin/internal/jvm/jvm.bzl                   |  11 +-
 kotlin/internal/toolchains.bzl                |  12 +-
 src/main/kotlin/BUILD.release.bazel           |   8 +-
 src/main/kotlin/bootstrap.bzl                 |   8 +-
 src/main/kotlin/io/bazel/kotlin/builder/BUILD |   8 +-
 .../io/bazel/kotlin/builder/cmd/BUILD.bazel   |   8 +-
 .../io/bazel/kotlin/builder/tasks/BUILD.bazel |   2 +-
 .../kotlin/builder/toolchain/BUILD.bazel      |   6 +-
 .../builder/toolchain/KotlinToolchain.kt      |   4 +-
 .../io/bazel/kotlin/compiler/BUILD.bazel      |   6 +-
 .../kotlin/io/bazel/kotlin/plugin/BUILD.bazel |   2 +-
 .../io/bazel/kotlin/plugin/jdeps/BUILD.bazel  |   2 +-
 .../BUILD.com_github_jetbrains_kotlin.bazel   | 102 --------------
 .../starlark/core/repositories/compiler.bzl   |   7 -
 .../core/repositories/initialize.release.bzl  |   1 -
 src/test/kotlin/io/bazel/kotlin/BUILD         |   4 +-
 src/test/kotlin/io/bazel/kotlin/builder/BUILD |   4 +-
 .../kotlin/builder/KotlinJvmTestBuilder.java  |  10 +-
 src/test/kotlin/io/bazel/kotlin/defs.bzl      |  12 +-
 .../io/bazel/kotlin/integration/BUILD.bazel   |   4 +-
 34 files changed, 248 insertions(+), 182 deletions(-)
 create mode 100644 kotlin/compiler/BUILD
 create mode 100644 kotlin/compiler/BUILD.release.bazel
 create mode 100644 kotlin/compiler/compiler.bzl

diff --git a/README.md b/README.md
index 14e1c20ca..956ba0e28 100644
--- a/README.md
+++ b/README.md
@@ -277,7 +277,7 @@ kt_compiler_plugin(
         "annotation": "plugin.allopen.OpenForTesting",
     },
     deps = [
-        "@com_github_jetbrains_kotlin//:allopen-compiler-plugin",
+        "@rules_kotlin//kotlin/compiler:allopen-compiler-plugin",
     ],
 )
 
diff --git a/docs/kotlin.md b/docs/kotlin.md
index 66170af3e..af9eaa4db 100755
--- a/docs/kotlin.md
+++ b/docs/kotlin.md
@@ -211,7 +211,7 @@ kt_jvm_test(<a href="#kt_jvm_test-name">name</a>, <a href="#kt_jvm_test-associat
         
         **Notes:**
         * The kotlin test library is not added implicitly, it is available with the label
-        `@com_github_jetbrains_kotlin//:kotlin-test`.
+        `@rules_kotlin//kotlin/compiler:kotlin-test`.
     
 
 **ATTRIBUTES**
@@ -330,7 +330,7 @@ kt_compiler_plugin(<a href="#kt_compiler_plugin-name">name</a>, <a href="#kt_com
                 "annotation": "plugin.OpenForTesting",
             },
             deps = [
-                "@com_github_jetbrains_kotlin//:allopen-compiler-plugin",
+                "@rules_kotlin//kotlin/compiler:allopen-compiler-plugin",
             ],
         )
         
diff --git a/examples/android/libKtAndroid/BUILD.bazel b/examples/android/libKtAndroid/BUILD.bazel
index ddb46c373..d8c5f0e6f 100644
--- a/examples/android/libKtAndroid/BUILD.bazel
+++ b/examples/android/libKtAndroid/BUILD.bazel
@@ -8,7 +8,7 @@ kt_compiler_plugin(
     id = "org.jetbrains.kotlin.serialization",
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:kotlinx-serialization-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:kotlinx-serialization-compiler-plugin",
     ],
 )
 
diff --git a/examples/plugin/src/allopen/BUILD b/examples/plugin/src/allopen/BUILD
index 39f10f566..df40efe5d 100644
--- a/examples/plugin/src/allopen/BUILD
+++ b/examples/plugin/src/allopen/BUILD
@@ -10,7 +10,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:allopen-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:allopen-compiler-plugin",
     ],
 )
 
diff --git a/examples/plugin/src/allopennoarg/BUILD b/examples/plugin/src/allopennoarg/BUILD
index be7f31afb..3f89c1ef0 100644
--- a/examples/plugin/src/allopennoarg/BUILD
+++ b/examples/plugin/src/allopennoarg/BUILD
@@ -10,7 +10,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:allopen-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:allopen-compiler-plugin",
     ],
 )
 
@@ -23,7 +23,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:noarg-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:noarg-compiler-plugin",
     ],
 )
 
@@ -64,7 +64,7 @@ kt_jvm_test(
     test_class = "plugin.allopennoarg.UserHasNoargConstructorTest",
     deps = [
         ":user",
-        "@com_github_jetbrains_kotlin//:kotlin-reflect",
+        "@io_bazel_rules_kotlin//kotlin/compiler:kotlin-reflect",
         "@maven//:junit_junit",
     ],
 )
diff --git a/examples/plugin/src/noarg/BUILD b/examples/plugin/src/noarg/BUILD
index 4d786ebc2..1e57e693a 100644
--- a/examples/plugin/src/noarg/BUILD
+++ b/examples/plugin/src/noarg/BUILD
@@ -10,7 +10,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:noarg-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:noarg-compiler-plugin",
     ],
 )
 
@@ -35,7 +35,7 @@ kt_jvm_test(
     test_class = "plugin.noarg.UserHasNoargConstructorTest",
     deps = [
         ":user",
-        "@com_github_jetbrains_kotlin//:kotlin-reflect",
+        "@io_bazel_rules_kotlin//kotlin/compiler:kotlin-reflect",
         "@maven//:junit_junit",
     ],
 )
diff --git a/examples/plugin/src/parcelize/BUILD b/examples/plugin/src/parcelize/BUILD
index e0ac8be71..945388777 100644
--- a/examples/plugin/src/parcelize/BUILD
+++ b/examples/plugin/src/parcelize/BUILD
@@ -8,7 +8,7 @@ kt_compiler_plugin(
     id = "org.jetbrains.kotlin.parcelize",
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:parcelize-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:parcelize-compiler-plugin",
     ],
 )
 
@@ -21,7 +21,7 @@ kt_jvm_library(
     ],
     visibility = ["//visibility:public"],
     exports = [
-        "@com_github_jetbrains_kotlin//:parcelize-runtime",
+        "@io_bazel_rules_kotlin//kotlin/compiler:parcelize-runtime",
     ],
 )
 
diff --git a/examples/plugin/src/sam_with_receiver/BUILD b/examples/plugin/src/sam_with_receiver/BUILD
index 33e518485..a2d4a43f7 100644
--- a/examples/plugin/src/sam_with_receiver/BUILD
+++ b/examples/plugin/src/sam_with_receiver/BUILD
@@ -11,7 +11,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:sam-with-receiver-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:sam-with-receiver-compiler-plugin",
     ],
 )
 
diff --git a/examples/plugin/src/serialization/BUILD b/examples/plugin/src/serialization/BUILD
index 3943085a6..1d8b7a5cb 100644
--- a/examples/plugin/src/serialization/BUILD
+++ b/examples/plugin/src/serialization/BUILD
@@ -7,7 +7,7 @@ kt_compiler_plugin(
     id = "org.jetbrains.kotlin.serialization",
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:kotlinx-serialization-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:kotlinx-serialization-compiler-plugin",
     ],
 )
 
diff --git a/kotlin/BUILD b/kotlin/BUILD
index 0774f9284..b30477bc2 100644
--- a/kotlin/BUILD
+++ b/kotlin/BUILD
@@ -28,6 +28,7 @@ release_archive(
         "BUILD.release.bazel": "BUILD.bazel",
     },
     deps = [
+        "//kotlin/compiler:pkg",
         "//kotlin/internal:pkg",
     ],
 )
diff --git a/kotlin/compiler/BUILD b/kotlin/compiler/BUILD
new file mode 100644
index 000000000..be998bde7
--- /dev/null
+++ b/kotlin/compiler/BUILD
@@ -0,0 +1,28 @@
+# Copyright 2020 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+load(":compiler.bzl", "kt_configure_compiler")
+load("//src/main/starlark/release:packager.bzl", "release_archive")
+
+package(default_visibility = ["//visibility:public"])
+
+# Configures the compiler
+kt_configure_compiler()
+
+release_archive(
+    name = "pkg",
+    srcs = glob(["*.bzl"]),
+    src_map = {
+        "BUILD.release.bazel": "BUILD.bazel",
+    },
+)
diff --git a/kotlin/compiler/BUILD.release.bazel b/kotlin/compiler/BUILD.release.bazel
new file mode 100644
index 000000000..343c27b89
--- /dev/null
+++ b/kotlin/compiler/BUILD.release.bazel
@@ -0,0 +1,19 @@
+# Copyright 2020 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+load(":compiler.bzl", "kt_configure_compiler")
+
+package(default_visibility = ["//visibility:public"])
+
+# Configures the compiler
+kt_configure_compiler()
diff --git a/kotlin/compiler/compiler.bzl b/kotlin/compiler/compiler.bzl
new file mode 100644
index 000000000..128d0aad7
--- /dev/null
+++ b/kotlin/compiler/compiler.bzl
@@ -0,0 +1,127 @@
+# Copyright 2022 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+load("//kotlin:jvm.bzl", "kt_jvm_import")
+load("//kotlin:js.bzl", "kt_js_import")
+load("@rules_java//java:defs.bzl", "java_import")
+load("//kotlin/internal:defs.bzl", _KT_COMPILER_REPO = "KT_COMPILER_REPO")
+
+_KT_COMPILER_REPO_PREFIX = "@" + _KT_COMPILER_REPO + "//:"
+
+def kt_configure_compiler():
+    """
+    Defines the toolchain_type and default toolchain for kotlin compilation.
+
+    Must be called in kotlin/internal/BUILD.bazel
+    """
+    if native.package_name() != "kotlin/compiler":
+        fail("kt_configure_compiler must be called in kotlin/compiler not %s" % native.package_name())
+
+    kt_jvm_import(
+        name = "annotations",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/annotations-13.0.jar",
+        neverlink = 1,
+    )
+
+    kt_jvm_import(
+        name = "jvm-abi-gen",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/jvm-abi-gen.jar",
+    )
+
+    # Kotlin dependencies that are internal to this repo and are meant to be loaded manually into a classloader.
+    [
+        kt_jvm_import(
+            name = "kotlin-%s" % art,
+            jar = _KT_COMPILER_REPO_PREFIX + "lib/kotlin-%s.jar" % art,
+            neverlink = 1,
+        )
+        for art in [
+            "annotation-processing",
+            "annotation-processing-runtime",
+            "compiler",
+        ]
+    ]
+
+    kt_jvm_import(
+        name = "kotlinx-serialization-compiler-plugin",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/kotlinx-serialization-compiler-plugin.jar",
+    )
+
+    kt_jvm_import(
+        name = "allopen-compiler-plugin",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/allopen-compiler-plugin.jar",
+    )
+
+    kt_jvm_import(
+        name = "noarg-compiler-plugin",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/noarg-compiler-plugin.jar",
+    )
+
+    kt_jvm_import(
+        name = "sam-with-receiver-compiler-plugin",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/sam-with-receiver-compiler-plugin.jar",
+    )
+
+    kt_jvm_import(
+        name = "parcelize-compiler-plugin",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/parcelize-compiler.jar",
+    )
+
+    kt_jvm_import(
+        name = "parcelize-runtime",
+        jar = _KT_COMPILER_REPO_PREFIX + "lib/parcelize-runtime.jar",
+    )
+
+    # Kotlin dependencies that are internal to this repo and may be linked.
+    [
+        java_import(
+            name = "kotlin-%s" % art,
+            jars = [_KT_COMPILER_REPO_PREFIX + "lib/kotlin-%s.jar" % art],
+        )
+        for art in [
+            "preloader",
+        ]
+    ]
+
+    #  The Kotlin standard libraries. These should be setup in a Toolchain.
+    [
+        kt_jvm_import(
+            name = "kotlin-%s" % art,
+            jar = _KT_COMPILER_REPO_PREFIX + "lib/kotlin-%s.jar" % art,
+            srcjar = _KT_COMPILER_REPO_PREFIX + "lib/kotlin-%s-sources.jar" % art,
+            visibility = ["//visibility:public"],
+        )
+        for art in [
+            "stdlib",
+            "stdlib-jdk7",
+            "stdlib-jdk8",
+            "reflect",
+            "test",
+            "script-runtime",
+        ]
+    ]
+
+    #  The Kotlin JS standard libraries. These should be setup in a Toolchain.
+    [
+        kt_js_import(
+            name = "kotlin-%s" % art,
+            jars = [_KT_COMPILER_REPO_PREFIX + "lib/kotlin-%s.jar" % art],
+            srcjar = _KT_COMPILER_REPO_PREFIX + "lib/kotlin-%s-sources.jar" % art,
+            visibility = ["//visibility:public"],
+        )
+        for art in [
+            "test-js",
+            "stdlib-js",
+        ]
+    ]
diff --git a/kotlin/internal/js/js.bzl b/kotlin/internal/js/js.bzl
index b25462a8e..e69ca6cbe 100644
--- a/kotlin/internal/js/js.bzl
+++ b/kotlin/internal/js/js.bzl
@@ -89,7 +89,7 @@ kt_js_library = rule(
         ),
         "_toolchain": attr.label(
             doc = """The Kotlin JS Runtime.""",
-            default = Label("@" + _KT_COMPILER_REPO + "//:kotlin-stdlib-js"),
+            default = Label("//kotlin/compiler:kotlin-stdlib-js"),
             cfg = "target",
         ),
     },
@@ -104,11 +104,13 @@ kt_js_library = rule(
     provides = [_KtJsInfo],
 )
 
+_KOTLIN_STDLIB_JS = Label("//kotlin/compiler:kotlin-stdlib-js")
+
 def kt_js_library_macro(name, **kwargs):
     kwargs = _lock_attrs(name, kwargs)
 
     # TODO this is a runtime dep, it should be picked up from the _toolchain attr or from a provider.
-    kwargs["deps"] = kwargs.get("deps", []) + ["@" + _KT_COMPILER_REPO + "//:kotlin-stdlib-js"]
+    kwargs["deps"] = kwargs.get("deps", []) + [_KOTLIN_STDLIB_JS]
     kt_js_library(name = name, **kwargs)
 
 kt_js_import = rule(
diff --git a/kotlin/internal/jvm/jvm.bzl b/kotlin/internal/jvm/jvm.bzl
index 93d345558..a9ec1fe60 100644
--- a/kotlin/internal/jvm/jvm.bzl
+++ b/kotlin/internal/jvm/jvm.bzl
@@ -41,12 +41,12 @@ test --strategy=KotlinCompile=worker
 ### Standard Libraries
 
 The Kotlin libraries that are bundled in a kotlin release should be used with the rules, the mandatory standard libraries are added implicetly. After enabling
-the repository the following Kotlin Libraries are also made available from the workspace `com_github_jetbrains_kotlin`:
+the repository the following Kotlin Libraries are also made available from the package `//kotlin/compiler`:
 
 * `kotlin-test`,
 * `kotlin-reflect`.
 
-So if you needed to add reflect as a dep use the following label `@com_github_jetbrains_kotlin//:kotlin-reflect`.
+So if you needed to add reflect as a dep use the following label `@rules_kotlin//kotlin/compiler:kotlin-reflect`.
 
 ### Mixed Mode compilation
 
@@ -96,7 +96,6 @@ load(
     "//kotlin/internal:defs.bzl",
     _JAVA_RUNTIME_TOOLCHAIN_TYPE = "JAVA_RUNTIME_TOOLCHAIN_TYPE",
     _JAVA_TOOLCHAIN_TYPE = "JAVA_TOOLCHAIN_TYPE",
-    _KT_COMPILER_REPO = "KT_COMPILER_REPO",
     _KtCompilerPluginInfo = "KtCompilerPluginInfo",
     _KtJvmInfo = "KtJvmInfo",
     _TOOLCHAIN_TYPE = "TOOLCHAIN_TYPE",
@@ -141,7 +140,7 @@ _implicit_deps = {
     "_toolchain": attr.label(
         doc = """The Kotlin JVM Runtime. it's only purpose is to enable the Android native rules to discover the Kotlin
         runtime for dexing""",
-        default = Label("@" + _KT_COMPILER_REPO + "//:kotlin-stdlib"),
+        default = Label("//kotlin/compiler:kotlin-stdlib"),
         cfg = "target",
     ),
     "_java_toolchain": attr.label(
@@ -335,7 +334,7 @@ Setup a simple kotlin_test.
 
 **Notes:**
 * The kotlin test library is not added implicitly, it is available with the label
-`@com_github_jetbrains_kotlin//:kotlin-test`.
+`@rules_kotlin//kotlin/compiler:kotlin-test`.
 """,
     attrs = utils.add_dicts(_runnable_common_attr, {
         "_bazel_test_runner": attr.label(
@@ -492,7 +491,7 @@ kt_compiler_plugin(
         "annotation": "plugin.OpenForTesting",
     },
     deps = [
-        "@com_github_jetbrains_kotlin//:allopen-compiler-plugin",
+        "@rules_kotlin//kotlin/compiler:allopen-compiler-plugin",
     ],
 )
 
diff --git a/kotlin/internal/toolchains.bzl b/kotlin/internal/toolchains.bzl
index 23aa0681c..5d208514e 100644
--- a/kotlin/internal/toolchains.bzl
+++ b/kotlin/internal/toolchains.bzl
@@ -157,7 +157,7 @@ _kt_toolchain = rule(
         "jvm_runtime": attr.label_list(
             doc = "The implicit jvm runtime libraries. This is internal.",
             default = [
-                Label("@" + _KT_COMPILER_REPO + "//:kotlin-stdlib"),
+                Label("//kotlin/compiler:kotlin-stdlib"),
             ],
             providers = [JavaInfo],
             cfg = "target",
@@ -165,12 +165,12 @@ _kt_toolchain = rule(
         "jvm_stdlibs": attr.label_list(
             doc = "The jvm stdlibs. This is internal.",
             default = [
-                Label("@" + _KT_COMPILER_REPO + "//:annotations"),
-                Label("@" + _KT_COMPILER_REPO + "//:kotlin-stdlib"),
-                Label("@" + _KT_COMPILER_REPO + "//:kotlin-stdlib-jdk7"),
+                Label("//kotlin/compiler:annotations"),
+                Label("//kotlin/compiler:kotlin-stdlib"),
+                Label("//kotlin/compiler:kotlin-stdlib-jdk7"),
                 # JDK8 is being added blindly but I think we will probably not support bytecode levels 1.6 when the
                 # repo stabelizes so this should be fine.
-                Label("@" + _KT_COMPILER_REPO + "//:kotlin-stdlib-jdk8"),
+                Label("//kotlin/compiler:kotlin-stdlib-jdk8"),
             ],
             providers = [JavaInfo],
             cfg = "target",
@@ -197,7 +197,7 @@ _kt_toolchain = rule(
         ),
         "js_stdlibs": attr.label_list(
             default = [
-                Label("@" + _KT_COMPILER_REPO + "//:kotlin-stdlib-js"),
+                Label("//kotlin/compiler:kotlin-stdlib-js"),
             ],
             providers = [_KtJsInfo],
         ),
diff --git a/src/main/kotlin/BUILD.release.bazel b/src/main/kotlin/BUILD.release.bazel
index 2bad2944c..a16b6afcc 100644
--- a/src/main/kotlin/BUILD.release.bazel
+++ b/src/main/kotlin/BUILD.release.bazel
@@ -39,13 +39,13 @@ java_binary(
     data = [
         ":jdeps-gen",
         ":skip-code-gen",
+        "//kotlin/compiler:jvm-abi-gen",
+        "//kotlin/compiler:kotlin-compiler",
         "//src/main/kotlin/io/bazel/kotlin/compiler",
-        "@com_github_jetbrains_kotlin//:jvm-abi-gen",
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
     ],
     jvm_flags = [
-        "-D@com_github_jetbrains_kotlin...jvm-abi-gen=$(rootpath @com_github_jetbrains_kotlin//:jvm-abi-gen)",
-        "-D@com_github_jetbrains_kotlin...kotlin-compiler=$(rootpath @com_github_jetbrains_kotlin//:kotlin-compiler)",
+        "-D..kotlin.compiler.jvm-abi-gen=$(rootpath //kotlin/compiler:jvm-abi-gen)",
+        "-D..kotlin.compiler.kotlin-compiler=$(rootpath //kotlin/compiler:kotlin-compiler)",
         "-XX:-MaxFDLimit",
     ],
     main_class = "io.bazel.kotlin.builder.cmd.Build",
diff --git a/src/main/kotlin/bootstrap.bzl b/src/main/kotlin/bootstrap.bzl
index db7728d84..9b2c9ce97 100644
--- a/src/main/kotlin/bootstrap.bzl
+++ b/src/main/kotlin/bootstrap.bzl
@@ -64,8 +64,8 @@ CP="%s"
 ARGS="%s"
 
 CMD="$(JAVA) -Xmx256M -Xms32M -noverify \
-      -cp $(location @com_github_jetbrains_kotlin//:kotlin-preloader) org.jetbrains.kotlin.preloading.Preloader \
-      -cp $(location @com_github_jetbrains_kotlin//:kotlin-compiler) org.jetbrains.kotlin.cli.jvm.K2JVMCompiler \
+      -cp $(location //kotlin/compiler:kotlin-preloader) org.jetbrains.kotlin.preloading.Preloader \
+      -cp $(location //kotlin/compiler:kotlin-compiler) org.jetbrains.kotlin.cli.jvm.K2JVMCompiler \
       $$CP -d $(@D)/$${NAME}_temp.jar $${ARGS} $(SRCS)"
 
 $$CMD
@@ -91,8 +91,8 @@ rm $(@D)/$${NAME}_temp.jar
         name = jar_label,
         tools = [
             "@com_github_jetbrains_kotlin//:home",
-            "@com_github_jetbrains_kotlin//:kotlin-preloader",
-            "@com_github_jetbrains_kotlin//:kotlin-compiler",
+            "//kotlin/compiler:kotlin-preloader",
+            "//kotlin/compiler:kotlin-compiler",
             "@bazel_tools//tools/jdk:singlejar",
             dep_label,
         ],
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/BUILD b/src/main/kotlin/io/bazel/kotlin/builder/BUILD
index 54966de81..565f2f297 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/BUILD
+++ b/src/main/kotlin/io/bazel/kotlin/builder/BUILD
@@ -18,10 +18,12 @@ java_library(
     srcs = glob(["*.java"]),
     visibility = ["//src:__subpackages__"],
     runtime_deps = [
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk7",
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk8",
+        "//kotlin/compiler:kotlin-stdlib-jdk7",
+        "//kotlin/compiler:kotlin-stdlib-jdk8",
     ],
     deps = [
+        "//kotlin/compiler:annotations",
+        "//kotlin/compiler:kotlin-stdlib",
         "//src/main/kotlin/io/bazel/kotlin/builder/tasks",
         "//src/main/kotlin/io/bazel/kotlin/builder/toolchain",
         "//src/main/kotlin/io/bazel/kotlin/builder/utils",
@@ -30,8 +32,6 @@ java_library(
         "//src/main/protobuf:kotlin_model_java_proto",
         "//src/main/protobuf:worker_protocol_java_proto",
         "//third_party:dagger",
-        "@com_github_jetbrains_kotlin//:annotations",
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib",
         "@kotlin_rules_maven//:javax_annotation_javax_annotation_api",
         "@kotlin_rules_maven//:javax_inject_javax_inject",
     ],
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel
index b50e1c9b9..c8e216764 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel
@@ -15,15 +15,15 @@ kt_bootstrap_library(
 kt_bootstrap_binary(
     name = "build",
     data = [
+        "//kotlin/compiler:jvm-abi-gen",
+        "//kotlin/compiler:kotlin-compiler",
         "//src/main/kotlin:jdeps-gen",
         "//src/main/kotlin:skip-code-gen",
         "//src/main/kotlin/io/bazel/kotlin/compiler",
-        "@com_github_jetbrains_kotlin//:jvm-abi-gen",
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
     ],
     jvm_flags = [
-        "-D@com_github_jetbrains_kotlin...jvm-abi-gen=$(rootpath @com_github_jetbrains_kotlin//:jvm-abi-gen)",
-        "-D@com_github_jetbrains_kotlin...kotlin-compiler=$(rootpath @com_github_jetbrains_kotlin//:kotlin-compiler)",
+        "-D..kotlin.compiler.jvm-abi-gen=$(rootpath //kotlin/compiler:jvm-abi-gen)",
+        "-D..kotlin.compiler.kotlin-compiler=$(rootpath //kotlin/compiler:kotlin-compiler)",
     ],
     main_class = "io.bazel.kotlin.builder.cmd.Build",
     runtime_library = ":build_lib",
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/tasks/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/builder/tasks/BUILD.bazel
index 10d018393..d8acfc648 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/tasks/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/builder/tasks/BUILD.bazel
@@ -24,6 +24,7 @@ kt_bootstrap_library(
     ],
     visibility = ["//src:__subpackages__"],
     deps = [
+        "//kotlin/compiler:kotlin-preloader",
         "//src/main/kotlin/io/bazel/kotlin/builder/toolchain",
         "//src/main/kotlin/io/bazel/kotlin/builder/utils",
         "//src/main/kotlin/io/bazel/kotlin/builder/utils/jars",
@@ -31,7 +32,6 @@ kt_bootstrap_library(
         "//src/main/protobuf:deps_java_proto",
         "//src/main/protobuf:kotlin_model_java_proto",
         "//src/main/protobuf:worker_protocol_java_proto",
-        "@com_github_jetbrains_kotlin//:kotlin-preloader",
         "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
         "@kotlin_rules_maven//:com_google_protobuf_protobuf_java_util",
         "@kotlin_rules_maven//:javax_inject_javax_inject",
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/toolchain/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/builder/toolchain/BUILD.bazel
index 25065c57c..db7728e66 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/toolchain/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/builder/toolchain/BUILD.bazel
@@ -19,16 +19,16 @@ kt_bootstrap_library(
         "*.kt",
     ]),
     neverlink_deps = [
-        "@com_github_jetbrains_kotlin//:jvm-abi-gen",
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
+        "//kotlin/compiler:jvm-abi-gen",
+        "//kotlin/compiler:kotlin-compiler",
     ],
     visibility = ["//src:__subpackages__"],
     deps = [
+        "//kotlin/compiler:kotlin-preloader",
         "//src/main/kotlin/io/bazel/kotlin/builder/utils",
         "//src/main/kotlin/io/bazel/kotlin/plugin:skip-code-gen-lib",
         "//src/main/kotlin/io/bazel/kotlin/plugin/jdeps:jdeps-gen-lib",
         "//src/main/protobuf:kotlin_model_java_proto",
-        "@com_github_jetbrains_kotlin//:kotlin-preloader",
         "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
         "@kotlin_rules_maven//:com_google_protobuf_protobuf_java_util",
         "@kotlin_rules_maven//:javax_inject_javax_inject",
diff --git a/src/main/kotlin/io/bazel/kotlin/builder/toolchain/KotlinToolchain.kt b/src/main/kotlin/io/bazel/kotlin/builder/toolchain/KotlinToolchain.kt
index c83c02007..d7e0a118e 100644
--- a/src/main/kotlin/io/bazel/kotlin/builder/toolchain/KotlinToolchain.kt
+++ b/src/main/kotlin/io/bazel/kotlin/builder/toolchain/KotlinToolchain.kt
@@ -55,7 +55,7 @@ class KotlinToolchain private constructor(
         )
 
     private val DEFAULT_JVM_ABI_PATH = BazelRunFiles.resolveVerified(
-      System.getProperty("@com_github_jetbrains_kotlin...jvm-abi-gen"),
+      System.getProperty("..kotlin.compiler.jvm-abi-gen"),
     ).toPath()
 
     private val COMPILER = BazelRunFiles.resolveVerified(
@@ -113,7 +113,7 @@ class KotlinToolchain private constructor(
       val jdepsGenFile = JDEPS_GEN_PLUGIN.verified().absoluteFile
 
       val kotlinCompilerJar = BazelRunFiles.resolveVerified(
-        System.getProperty("@com_github_jetbrains_kotlin...kotlin-compiler"),
+        System.getProperty("..kotlin.compiler.kotlin-compiler"),
       )
 
       val jvmAbiGenFile = jvmAbiGenPath.verified()
diff --git a/src/main/kotlin/io/bazel/kotlin/compiler/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/compiler/BUILD.bazel
index 4c310e7e8..3a1472670 100644
--- a/src/main/kotlin/io/bazel/kotlin/compiler/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/compiler/BUILD.bazel
@@ -20,9 +20,9 @@ kt_bootstrap_library(
     name = "compiler",
     srcs = glob(["*.kt"]),
     neverlink_deps = [
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
-        "@com_github_jetbrains_kotlin//:kotlin-annotation-processing",
-        "@com_github_jetbrains_kotlin//:kotlin-script-runtime",
+        "//kotlin/compiler:kotlin-compiler",
+        "//kotlin/compiler:kotlin-annotation-processing",
+        "//kotlin/compiler:kotlin-script-runtime",
     ],
     visibility = ["//src:__subpackages__"],
 )
diff --git a/src/main/kotlin/io/bazel/kotlin/plugin/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/plugin/BUILD.bazel
index eaa662124..dc1cd8502 100644
--- a/src/main/kotlin/io/bazel/kotlin/plugin/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/plugin/BUILD.bazel
@@ -22,7 +22,7 @@ kt_bootstrap_library(
     srcs = glob(["*.kt"]),
     visibility = ["//src:__subpackages__"],
     deps = [
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
+        "//kotlin/compiler:kotlin-compiler",
     ],
 )
 
diff --git a/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/BUILD.bazel b/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/BUILD.bazel
index 60f5b07ee..48a6f1bf8 100644
--- a/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/BUILD.bazel
+++ b/src/main/kotlin/io/bazel/kotlin/plugin/jdeps/BUILD.bazel
@@ -22,9 +22,9 @@ kt_bootstrap_library(
     srcs = glob(["*.kt"]),
     visibility = ["//src:__subpackages__"],
     deps = [
+        "//kotlin/compiler:kotlin-compiler",
         "//src/main/kotlin/io/bazel/kotlin/builder/utils/jars",
         "//src/main/protobuf:deps_java_proto",
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
         "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
     ],
 )
diff --git a/src/main/starlark/core/repositories/BUILD.com_github_jetbrains_kotlin.bazel b/src/main/starlark/core/repositories/BUILD.com_github_jetbrains_kotlin.bazel
index 85dbde4cc..b207139f9 100644
--- a/src/main/starlark/core/repositories/BUILD.com_github_jetbrains_kotlin.bazel
+++ b/src/main/starlark/core/repositories/BUILD.com_github_jetbrains_kotlin.bazel
@@ -11,10 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# dev_io_bazel_rules_kotlin
-load("@{{.KotlinRulesRepository}}//kotlin:jvm.bzl", "kt_jvm_import")
-load("@{{.KotlinRulesRepository}}//kotlin:js.bzl", "kt_js_import")
-load("@rules_java//java:defs.bzl", "java_import")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -23,101 +19,3 @@ filegroup(
     name = "home",
     srcs = glob(["**"]),
 )
-
-kt_jvm_import(
-    name = "annotations",
-    jar = "lib/annotations-13.0.jar",
-    neverlink = 1,
-)
-
-kt_jvm_import(
-    name = "jvm-abi-gen",
-    jar = "lib/jvm-abi-gen.jar",
-)
-
-# Kotlin dependencies that are internal to this repo and are meant to be loaded manually into a classloader.
-[
-    kt_jvm_import(
-        name = "kotlin-%s" % art,
-        jar = "lib/kotlin-%s.jar" % art,
-        neverlink = 1,
-    )
-    for art in [
-        "annotation-processing",
-        "annotation-processing-runtime",
-        "compiler",
-    ]
-]
-
-kt_jvm_import(
-    name = "kotlinx-serialization-compiler-plugin",
-    jar = "lib/kotlinx-serialization-compiler-plugin.jar",
-)
-
-kt_jvm_import(
-    name = "allopen-compiler-plugin",
-    jar = "lib/allopen-compiler-plugin.jar",
-)
-
-kt_jvm_import(
-    name = "noarg-compiler-plugin",
-    jar = "lib/noarg-compiler-plugin.jar",
-)
-
-kt_jvm_import(
-    name = "sam-with-receiver-compiler-plugin",
-    jar = "lib/sam-with-receiver-compiler-plugin.jar",
-)
-
-kt_jvm_import(
-    name = "parcelize-compiler-plugin",
-    jar = "lib/parcelize-compiler.jar",
-)
-
-kt_jvm_import(
-    name = "parcelize-runtime",
-    jar = "lib/parcelize-runtime.jar",
-)
-
-# Kotlin dependencies that are internal to this repo and may be linked.
-[
-    java_import(
-        name = "kotlin-%s" % art,
-        jars = ["lib/kotlin-%s.jar" % art],
-    )
-    for art in [
-        "preloader",
-    ]
-]
-
-#  The Kotlin standard libraries. These should be setup in a Toolchain.
-[
-    kt_jvm_import(
-        name = "kotlin-%s" % art,
-        jar = "lib/kotlin-%s.jar" % art,
-        srcjar = "lib/kotlin-%s-sources.jar" % art,
-        visibility = ["//visibility:public"],
-    )
-    for art in [
-        "stdlib",
-        "stdlib-jdk7",
-        "stdlib-jdk8",
-        "reflect",
-        "test",
-        "script-runtime",
-    ]
-]
-
-#  The Kotlin JS standard libraries. These should be setup in a Toolchain.
-[
-    kt_js_import(
-        name = "kotlin-%s" % art,
-        jars = ["lib/kotlin-%s.jar" % art],
-        srcjar = "lib/kotlin-%s-sources.jar" % art,
-        visibility = ["//visibility:public"],
-    )
-    for art in [
-        "test-js",
-        "stdlib-js",
-    ]
-]
diff --git a/src/main/starlark/core/repositories/compiler.bzl b/src/main/starlark/core/repositories/compiler.bzl
index d11718118..18cfd831a 100644
--- a/src/main/starlark/core/repositories/compiler.bzl
+++ b/src/main/starlark/core/repositories/compiler.bzl
@@ -13,9 +13,6 @@ def _kotlin_compiler_impl(repository_ctx):
     repository_ctx.template(
         "BUILD.bazel",
         attr._template,
-        substitutions = {
-            "{{.KotlinRulesRepository}}": attr.kotlin_rules,
-        },
         executable = False,
     )
 
@@ -26,10 +23,6 @@ kotlin_compiler_repository = repository_rule(
             doc = "A list of urls for the kotlin compiler",
             mandatory = True,
         ),
-        "kotlin_rules": attr.string(
-            doc = "target of the kotlin rules.",
-            mandatory = True,
-        ),
         "sha256": attr.string(
             doc = "sha256 of the compiler archive",
         ),
diff --git a/src/main/starlark/core/repositories/initialize.release.bzl b/src/main/starlark/core/repositories/initialize.release.bzl
index 71b429245..df7c408ec 100644
--- a/src/main/starlark/core/repositories/initialize.release.bzl
+++ b/src/main/starlark/core/repositories/initialize.release.bzl
@@ -49,7 +49,6 @@ def kotlin_repositories(
         name = compiler_repository_name,
         urls = [url.format(version = compiler_release.version) for url in compiler_release.url_templates],
         sha256 = compiler_release.sha256,
-        kotlin_rules = RULES_KOTLIN.workspace_name,
     )
 
     http_file(
diff --git a/src/test/kotlin/io/bazel/kotlin/BUILD b/src/test/kotlin/io/bazel/kotlin/BUILD
index 513ec3f32..f87a75b32 100644
--- a/src/test/kotlin/io/bazel/kotlin/BUILD
+++ b/src/test/kotlin/io/bazel/kotlin/BUILD
@@ -22,13 +22,13 @@ kt_jvm_library(
     srcs = ["KotlinAssertionTestCase.kt"],
     visibility = ["//visibility:public"],
     exports = [
-        "@com_github_jetbrains_kotlin//:kotlin-test",
+        "//kotlin/compiler:kotlin-test",
         "@kotlin_rules_maven//:com_google_guava_guava",
         "@kotlin_rules_maven//:com_google_truth_truth",
         "@kotlin_rules_maven//:junit_junit",
     ],
     deps = [
-        "@com_github_jetbrains_kotlin//:kotlin-test",
+        "//kotlin/compiler:kotlin-test",
         "@kotlin_rules_maven//:com_google_guava_guava",
     ],
 )
diff --git a/src/test/kotlin/io/bazel/kotlin/builder/BUILD b/src/test/kotlin/io/bazel/kotlin/builder/BUILD
index 4051c22fc..054307c42 100644
--- a/src/test/kotlin/io/bazel/kotlin/builder/BUILD
+++ b/src/test/kotlin/io/bazel/kotlin/builder/BUILD
@@ -47,9 +47,9 @@ java_library(
         "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
     ],
     runtime_deps = [
+        "//kotlin/compiler:kotlin-reflect",
+        "//kotlin/compiler:kotlin-stdlib",
         "@bazel_tools//tools/jdk:JacocoCoverage",
-        "@com_github_jetbrains_kotlin//:kotlin-reflect",
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib",
     ],
     deps = _COMMON_DEPS + [
         "//third_party:autovalue",
diff --git a/src/test/kotlin/io/bazel/kotlin/builder/KotlinJvmTestBuilder.java b/src/test/kotlin/io/bazel/kotlin/builder/KotlinJvmTestBuilder.java
index 6f44eddc8..8fb2ea803 100644
--- a/src/test/kotlin/io/bazel/kotlin/builder/KotlinJvmTestBuilder.java
+++ b/src/test/kotlin/io/bazel/kotlin/builder/KotlinJvmTestBuilder.java
@@ -36,11 +36,11 @@ public final class KotlinJvmTestBuilder extends KotlinAbstractTestBuilder<JvmCom
 
     @SuppressWarnings({"unused", "WeakerAccess"})
     public static Dep
-            KOTLIN_ANNOTATIONS = Dep.fromLabel("@com_github_jetbrains_kotlin//:annotations"),
-            KOTLIN_STDLIB = Dep.fromLabel("@com_github_jetbrains_kotlin//:kotlin-stdlib"),
-            KOTLIN_STDLIB_JDK7 = Dep.fromLabel("@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk7"),
-            KOTLIN_STDLIB_JDK8 = Dep.fromLabel("@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk8"),
-            JVM_ABI_GEN = Dep.fromLabel("@com_github_jetbrains_kotlin//:jvm-abi-gen");
+            KOTLIN_ANNOTATIONS = Dep.fromLabel("//kotlin/compiler:annotations"),
+            KOTLIN_STDLIB = Dep.fromLabel("//kotlin/compiler:kotlin-stdlib"),
+            KOTLIN_STDLIB_JDK7 = Dep.fromLabel("//kotlin/compiler:kotlin-stdlib-jdk7"),
+            KOTLIN_STDLIB_JDK8 = Dep.fromLabel("//kotlin/compiler:kotlin-stdlib-jdk8"),
+            JVM_ABI_GEN = Dep.fromLabel("//kotlin/compiler:jvm-abi-gen");
 
     private static final JvmCompilationTask.Builder taskBuilder = JvmCompilationTask.newBuilder();
     private static final EnumSet<DirectoryType> ALL_DIRECTORY_TYPES =
diff --git a/src/test/kotlin/io/bazel/kotlin/defs.bzl b/src/test/kotlin/io/bazel/kotlin/defs.bzl
index f608ed1af..2b66217b9 100644
--- a/src/test/kotlin/io/bazel/kotlin/defs.bzl
+++ b/src/test/kotlin/io/bazel/kotlin/defs.bzl
@@ -33,12 +33,12 @@ def kt_rules_test(name, **kwargs):
         "//src/main/kotlin/io/bazel/kotlin/compiler",
         "//src/main/kotlin:skip-code-gen",
         "//src/main/kotlin:jdeps-gen",
-        "@com_github_jetbrains_kotlin//:annotations",
-        "@com_github_jetbrains_kotlin//:jvm-abi-gen",
-        "@com_github_jetbrains_kotlin//:kotlin-compiler",
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib",
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk7",
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib-jdk8",
+        "//kotlin/compiler:annotations",
+        "//kotlin/compiler:jvm-abi-gen",
+        "//kotlin/compiler:kotlin-compiler",
+        "//kotlin/compiler:kotlin-stdlib",
+        "//kotlin/compiler:kotlin-stdlib-jdk7",
+        "//kotlin/compiler:kotlin-stdlib-jdk8",
     ] + args["data"]:
         if dep not in args["data"]:
             args["data"].append(dep)
diff --git a/src/test/kotlin/io/bazel/kotlin/integration/BUILD.bazel b/src/test/kotlin/io/bazel/kotlin/integration/BUILD.bazel
index bbe02ffec..1bf2ffb97 100644
--- a/src/test/kotlin/io/bazel/kotlin/integration/BUILD.bazel
+++ b/src/test/kotlin/io/bazel/kotlin/integration/BUILD.bazel
@@ -14,7 +14,7 @@ kt_jvm_test(
     srcs = ["WriteWorkspaceTest.kt"],
     deps = [
         ":lib",
-        "@com_github_jetbrains_kotlin//:kotlin-test",
+        "//kotlin/compiler:kotlin-test",
         "@kotlin_rules_maven//:com_google_truth_truth",
         "@kotlin_rules_maven//:junit_junit",
     ],
@@ -30,7 +30,7 @@ kt_jvm_test(
     test_class = "io.bazel.kotlin.integration.MixedSourceCompileTest",
     deps = [
         ":lib",
-        "@com_github_jetbrains_kotlin//:kotlin-test",
+        "//kotlin/compiler:kotlin-test",
         "@kotlin_rules_maven//:com_google_truth_truth",
         "@kotlin_rules_maven//:junit_junit",
     ],