Move the KSP and compiler target definitions into rules_kotlin (#1014)
* Move the KSP and compiler target definitions into rules_kotlin
* Docs
* Fix JS
* More fixes
* More
* Docs
diff --git a/src/test/kotlin/io/bazel/kotlin/BUILD b/src/test/kotlin/io/bazel/kotlin/BUILD
index 513ec3f..f87a75b 100644
--- a/src/test/kotlin/io/bazel/kotlin/BUILD
+++ b/src/test/kotlin/io/bazel/kotlin/BUILD
@@ -22,13 +22,13 @@
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 9a1a714..26e205e 100644
--- a/src/test/kotlin/io/bazel/kotlin/builder/BUILD
+++ b/src/test/kotlin/io/bazel/kotlin/builder/BUILD
@@ -45,9 +45,9 @@
],
exports = _COMMON_DEPS,
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 + [
"//src/main/kotlin/io/bazel/kotlin/builder/tasks",
diff --git a/src/test/kotlin/io/bazel/kotlin/builder/KotlinAbstractTestBuilder.java b/src/test/kotlin/io/bazel/kotlin/builder/KotlinAbstractTestBuilder.java
index 8aff079..dc1a804 100644
--- a/src/test/kotlin/io/bazel/kotlin/builder/KotlinAbstractTestBuilder.java
+++ b/src/test/kotlin/io/bazel/kotlin/builder/KotlinAbstractTestBuilder.java
@@ -229,14 +229,14 @@
}
return KotlinToolchain.createToolchain(
javaHome,
- new File(Deps.Dep.fromLabel("@com_github_jetbrains_kotlin//:kotlin-compiler").singleCompileJar()),
+ new File(Deps.Dep.fromLabel("//kotlin/compiler:kotlin-compiler").singleCompileJar()),
new File(Deps.Dep.fromLabel("//src/main/kotlin/io/bazel/kotlin/compiler").singleCompileJar()),
- new File(Deps.Dep.fromLabel("@com_github_jetbrains_kotlin//:jvm-abi-gen").singleCompileJar()),
+ new File(Deps.Dep.fromLabel("//kotlin/compiler:jvm-abi-gen").singleCompileJar()),
new File(Deps.Dep.fromLabel("//src/main/kotlin:skip-code-gen").singleCompileJar()),
new File(Deps.Dep.fromLabel("//src/main/kotlin:jdeps-gen").singleCompileJar()),
- new File(Deps.Dep.fromLabel("@com_github_jetbrains_kotlin//:kotlin-annotation-processing").singleCompileJar()),
- new File(Deps.Dep.fromLabel("@com_github_google_ksp//:symbol-processing-api").singleCompileJar()),
- new File(Deps.Dep.fromLabel("@com_github_google_ksp//:symbol-processing-cmdline").singleCompileJar())
+ new File(Deps.Dep.fromLabel("//kotlin/compiler:kotlin-annotation-processing").singleCompileJar()),
+ new File(Deps.Dep.fromLabel("//kotlin/compiler:symbol-processing-api").singleCompileJar()),
+ new File(Deps.Dep.fromLabel("//kotlin/compiler:symbol-processing-cmdline").singleCompileJar())
);
}
}
diff --git a/src/test/kotlin/io/bazel/kotlin/builder/KotlinJvmTestBuilder.java b/src/test/kotlin/io/bazel/kotlin/builder/KotlinJvmTestBuilder.java
index b74a914..39c07ae 100644
--- a/src/test/kotlin/io/bazel/kotlin/builder/KotlinJvmTestBuilder.java
+++ b/src/test/kotlin/io/bazel/kotlin/builder/KotlinJvmTestBuilder.java
@@ -35,11 +35,11 @@
@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 b9ebd50..fbc96bf 100644
--- a/src/test/kotlin/io/bazel/kotlin/defs.bzl
+++ b/src/test/kotlin/io/bazel/kotlin/defs.bzl
@@ -34,15 +34,15 @@
"//src/main/kotlin/io/bazel/kotlin/compiler",
"//src/main/kotlin:skip-code-gen",
"//src/main/kotlin:jdeps-gen",
- "@com_github_google_ksp//:symbol-processing-api",
- "@com_github_google_ksp//:symbol-processing-cmdline",
- "@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",
- "@com_github_jetbrains_kotlin//:kotlin-annotation-processing",
+ "//kotlin/compiler:symbol-processing-api",
+ "//kotlin/compiler:symbol-processing-cmdline",
+ "//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",
+ "//kotlin/compiler:kotlin-annotation-processing",
] + 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 bbe02ff..1bf2ffb 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 @@
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 @@
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",
],