Revert ABI gen changes to get some fresh benchmarks

Author: Bencodes

kotlin/settings/BUILD.bazel

@@ -37,7 +37,7 @@ bool_flag(
 )
 
 # Kotlin strict deps can be enabled by setting the following value on the command line
-# --@rules_kotlin//kotlin/settings:experimental_exclude_assocate_compile_jars_from_associates=True
+# --@io_bazel_rules_kotlin//kotlin/internal/jvm:experimental_exclude_assocate_compile_jars_from_associates=True
 bool_flag(
     name = "experimental_exclude_assocate_compile_jars_from_associates",
     build_setting_default = False,

kotlin/settings/BUILD.release.bazel

@@ -29,7 +29,7 @@ bool_flag(
 )
 
 # Kotlin strict deps can be enabled by setting the following value on the command line
-# --@rules_kotlin//kotlin/settings:experimental_exclude_assocate_compile_jars_from_associates=True
+# --@io_bazel_rules_kotlin//kotlin/internal/jvm:experimental_exclude_assocate_compile_jars_from_associates=True
 bool_flag(
     name = "experimental_exclude_assocate_compile_jars_from_associates",
     build_setting_default = False,

src/main/kotlin/BUILD

@@ -6,12 +6,6 @@ exports_files(
     visibility = ["//src:__subpackages__"],
 )
 
-filegroup(
-    name = "jvm-abi-gen",
-    srcs = ["jvm-abi-gen-1.9.20-with-DataClasses-SourceDebugExtension-NestedClasses-SortedOrder-Companions-InlineDebugInfo.jar"],
-    visibility = ["//visibility:public"],
-)
-
 jar_jar(
     name = "skip-code-gen",
     input_jar = "//src/main/kotlin/io/bazel/kotlin/plugin:skip-code-gen_deploy.jar",
@@ -42,7 +36,6 @@ release_archive(
     name = "pkg",
     srcs = [
         ":jdeps-gen.jar",
-        ":jvm-abi-gen-1.9.20-with-DataClasses-SourceDebugExtension-NestedClasses-SortedOrder-Companions-InlineDebugInfo.jar",
         ":skip-code-gen.jar",
     ],
     package_dir = "src/main/kotlin",  # explicitly set the package directory, as there are no parent release_archives.

src/main/kotlin/BUILD.release.bazel

@@ -14,12 +14,6 @@
 
 load("@rules_java//java:defs.bzl", "java_binary", "java_import")
 
-java_import(
-    name = "jvm-abi-gen",
-    jars = ["jvm-abi-gen-1.9.20-with-DataClasses-SourceDebugExtension-NestedClasses-SortedOrder-Companions-InlineDebugInfo.jar"],
-    visibility = ["//visibility:public"],
-)
-
 java_import(
     name = "worker",
     jars = ["kotlin_worker.jar"],
@@ -44,8 +38,8 @@ java_binary(
     name = "build",
     data = [
         ":jdeps-gen",
-        ":jvm-abi-gen",
         ":skip-code-gen",
+        "//kotlin/compiler:jvm-abi-gen",
         "//kotlin/compiler:kotlin-annotation-processing",
         "//kotlin/compiler:kotlin-compiler",
         "//kotlin/compiler:kotlin-reflect",
@@ -55,7 +49,7 @@ java_binary(
         "@com_github_jetbrains_kotlin//:home",
     ],
     jvm_flags = [
-        "-D@com_github_jetbrains_kotlin...jvm-abi-gen=$(rlocationpath :jvm-abi-gen)",
+        "-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@rules_kotlin...jdeps-gen=$(rlocationpath //src/main/kotlin:jdeps-gen)",

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

@@ -1,11 +1,5 @@
 load("//src/main/kotlin:bootstrap.bzl", "kt_bootstrap_binary", "kt_bootstrap_library")
 
-java_import(
-    name = "jvm-abi-gen",
-    jars = ["//src/main/kotlin:jvm-abi-gen"],
-    visibility = ["//visibility:public"],
-)
-
 kt_bootstrap_library(
     name = "build_lib",
     srcs = ["Build.kt"],
@@ -21,7 +15,7 @@ kt_bootstrap_library(
 kt_bootstrap_binary(
     name = "build",
     data = [
-        ":jvm-abi-gen",
+        "//kotlin/compiler:jvm-abi-gen",
         "//kotlin/compiler:kotlin-annotation-processing",
         "//kotlin/compiler:kotlin-compiler",
         "//kotlin/compiler:kotlin-reflect",
@@ -33,7 +27,7 @@ kt_bootstrap_binary(
         "@com_github_jetbrains_kotlin//:home",
     ],
     jvm_flags = [
-        "-D@com_github_jetbrains_kotlin...jvm-abi-gen=$(rlocationpath :jvm-abi-gen)",
+        "-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@rules_kotlin...jdeps-gen=$(rlocationpath //src/main/kotlin:jdeps-gen)",

src/main/kotlin/jvm-abi-gen-1.9.20-with-DataClasses-SourceDebugExtension-NestedClasses-SortedOrder-Companions-InlineDebugInfo.jar

@@ -60,7 +60,7 @@ kotlin_compiler_repository = repository_rule(
         ),
         "_template": attr.label(
             doc = "repository build file template",
-            default = "BUILD.com_github_jetbrains_kotlin.bazel",
+            default = ":BUILD.com_github_jetbrains_kotlin.bazel",
         ),
         "_capabilities_templates": attr.label_list(
             doc = "compiler capabilities file templates",