Provision build tools API with http_archive over Maven

Author: erikkerber

MODULE.bazel

@@ -29,6 +29,7 @@ use_repo(
     "com_github_jetbrains_kotlin",
     "com_github_jetbrains_kotlin_git",
     "com_github_pinterest_ktlint",
+    "kotlin_build_tools_impl",
     "kotlinx_serialization_core_jvm",
     "kotlinx_serialization_json",
     "kotlinx_serialization_json_jvm",

MODULE.release.bazel

@@ -30,6 +30,7 @@ use_repo(
     "kotlinx_serialization_core_jvm",
     "kotlinx_serialization_json",
     "kotlinx_serialization_json_jvm",
+    "kotlin_build_tools_impl",
 )
 
 register_toolchains("//kotlin/internal:default_toolchain")

kotlin_rules_maven_install.json

@@ -47,6 +47,7 @@ java_binary(
         "//kotlin/compiler:symbol-processing-cmdline",
         "//src/main/kotlin/io/bazel/kotlin/compiler",
         "@com_github_jetbrains_kotlin//:home",
+        "@kotlin_build_tools_impl//jar",
         "@kotlinx_serialization_core_jvm//jar",
         "@kotlinx_serialization_json//jar",
         "@kotlinx_serialization_json_jvm//jar",
@@ -55,10 +56,10 @@ java_binary(
         "-D@com_github_jetbrains_kotlinx...serialization-core-jvm=$(rlocationpath @kotlinx_serialization_core_jvm//jar)",
         "-D@com_github_jetbrains_kotlinx...serialization-json=$(rlocationpath @kotlinx_serialization_json//jar)",
         "-D@com_github_jetbrains_kotlinx...serialization-json-jvm=$(rlocationpath @kotlinx_serialization_json_jvm//jar)",
+        "-D@com_github_jetbrains_kotlin...build-tools-impl=$(rlocationpath @kotlin_build_tools_impl//jar)",
         "-D@com_github_jetbrains_kotlin...jvm-abi-gen=$(rlocationpath //kotlin/compiler:jvm-abi-gen)",
         "-D@com_github_jetbrains_kotlin...kotlin-compiler=$(rlocationpath //kotlin/compiler:kotlin-compiler)",
         "-D@com_github_jetbrains_kotlin...kapt=$(rlocationpath //kotlin/compiler:kotlin-annotation-processing)",
-        "-D@com_github_jetbrains_kotlin...build-tools-impl=$(rlocationpath @kotlin_rules_maven//:org_jetbrains_kotlin_kotlin_build_tools_impl)",
         "-D@rules_kotlin...jdeps-gen=$(rlocationpath //src/main/kotlin:jdeps-gen)",
         "-D@rules_kotlin...skip-code-gen=$(rlocationpath //src/main/kotlin:skip-code-gen)",
         "-D@rules_kotlin...compiler=$(rlocationpath //src/main/kotlin/io/bazel/kotlin/compiler)",

src/main/kotlin/BUILD.release.bazel

@@ -26,7 +26,7 @@ kt_bootstrap_binary(
         "//src/main/kotlin:skip-code-gen",
         "//src/main/kotlin/io/bazel/kotlin/compiler:compiler.jar",
         "@com_github_jetbrains_kotlin//:home",
-        "@kotlin_rules_maven//:org_jetbrains_kotlin_kotlin_build_tools_impl",
+        "@kotlin_build_tools_impl//jar",
         "@kotlinx_serialization_core_jvm//jar",
         "@kotlinx_serialization_json//jar",
         "@kotlinx_serialization_json_jvm//jar",
@@ -35,10 +35,10 @@ kt_bootstrap_binary(
         "-D@com_github_jetbrains_kotlinx...serialization-core-jvm=$(rlocationpath @kotlinx_serialization_core_jvm//jar)",
         "-D@com_github_jetbrains_kotlinx...serialization-json=$(rlocationpath @kotlinx_serialization_json//jar)",
         "-D@com_github_jetbrains_kotlinx...serialization-json-jvm=$(rlocationpath @kotlinx_serialization_json_jvm//jar)",
+        "-D@com_github_jetbrains_kotlin...build-tools-impl=$(rlocationpath @kotlin_build_tools_impl//jar)",
         "-D@com_github_jetbrains_kotlin...jvm-abi-gen=$(rlocationpath //kotlin/compiler:jvm-abi-gen)",
         "-D@com_github_jetbrains_kotlin...kotlin-compiler=$(rlocationpath //kotlin/compiler:kotlin-compiler)",
         "-D@com_github_jetbrains_kotlin...kapt=$(rlocationpath //kotlin/compiler:kotlin-annotation-processing)",
-        "-D@com_github_jetbrains_kotlin...build-tools-impl=$(rlocationpath @kotlin_rules_maven//:org_jetbrains_kotlin_kotlin_build_tools_impl)",
         "-D@rules_kotlin...jdeps-gen=$(rlocationpath //src/main/kotlin:jdeps-gen)",
         "-D@rules_kotlin...skip-code-gen=$(rlocationpath //src/main/kotlin:skip-code-gen)",
         "-D@rules_kotlin...compiler=$(rlocationpath //src/main/kotlin/io/bazel/kotlin/compiler:compiler.jar)",

src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel

@@ -93,6 +93,13 @@ def kotlin_repositories(
         urls = [url.format(version = versions.KOTLINX_SERIALIZATION_JSON_JVM.version) for url in versions.KOTLINX_SERIALIZATION_JSON_JVM.url_templates],
     )
 
+    maybe(
+        http_jar,
+        name = "kotlin_build_tools_impl",
+        sha256 = versions.KOTLIN_BUILD_TOOLS_IMPL.sha256,
+        urls = [url.format(version = versions.KOTLIN_BUILD_TOOLS_IMPL.version) for url in versions.KOTLIN_BUILD_TOOLS_IMPL.url_templates],
+    )
+
     if is_bzlmod:
         return
 

src/main/starlark/core/repositories/initialize.release.bzl

@@ -87,6 +87,13 @@ versions = struct(
         ],
         sha256 = "9f74659d447d3df29cabe0c8ee068810af313a584c1bbdde821f9894127f26e0",
     ),
+    KOTLIN_BUILD_TOOLS_IMPL = version(
+        version = "2.1.20",
+        url_templates = [
+            "https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-build-tools-impl/{version}/kotlin-build-tools-impl-{version}.jar",
+        ],
+        sha256 = "6e94896e321603e3bfe89fef02478e44d1d64a3d25d49d0694892ffc01c60acf",
+    ),
     RULES_ANDROID = version(
         version = "0.6.4",
         url_templates = [

src/main/starlark/core/repositories/versions.bzl

@@ -47,7 +47,6 @@ java_library(
         "//kotlin/compiler:kotlin-reflect",
         "//kotlin/compiler:kotlin-stdlib",
         "@bazel_tools//tools/jdk:JacocoCoverage",
-        "@kotlin_rules_maven//:org_jetbrains_kotlin_kotlin_build_tools_api",
     ],
     deps = _COMMON_DEPS + [
         "//src/main/kotlin/io/bazel/kotlin/builder/tasks",

src/test/kotlin/io/bazel/kotlin/builder/BUILD

@@ -235,7 +235,7 @@ static KotlinToolchain toolchainForTest() {
         return KotlinToolchain.createToolchain(
                 javaHome,
                 new File(Deps.Dep.fromLabel("//kotlin/compiler:kotlin-compiler").singleCompileJar()),
-                new File(Deps.Dep.fromLabel("@kotlin_rules_maven//:org_jetbrains_kotlin_kotlin_build_tools_impl").singleCompileJar()),
+                new File(Deps.Dep.fromLabel("@kotlin_build_tools_impl//jar").singleCompileJar()),
                 new File(Deps.Dep.fromLabel("//src/main/kotlin/io/bazel/kotlin/compiler:compiler.jar").singleCompileJar()),
                 new File(Deps.Dep.fromLabel("//kotlin/compiler:jvm-abi-gen").singleCompileJar()),
                 new File(Deps.Dep.fromLabel("//src/main/kotlin:skip-code-gen").singleCompileJar()),

src/test/kotlin/io/bazel/kotlin/builder/KotlinAbstractTestBuilder.java

@@ -47,7 +47,7 @@ def kt_rules_test(name, **kwargs):
         "@kotlinx_serialization_core_jvm//jar",
         "@kotlinx_serialization_json//jar",
         "@kotlinx_serialization_json_jvm//jar",
-        "@kotlin_rules_maven//:org_jetbrains_kotlin_kotlin_build_tools_impl",
+        "@kotlin_build_tools_impl//jar",
     ] + args["data"]:
         if dep not in args["data"]:
             args["data"].append(dep)