From bd0fe2f146c5c7b8bb849195fc0d455ffeaa0e5f Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Wed, 15 Jun 2022 22:58:31 +0200
Subject: [PATCH] Remove dependency of compiler tests on fir2ir tests

Compiler tests use the old test infrastructure, but fir2ir tests use the
new one (tests-common-new). Removing this dependency means that now the
two big modules, `:compiler:compileTestKotlin` and
`:compiler:tests-common-new:compileTestKotlin` can be compiled in
parallel, which improves the total build time.
---
 compiler/build.gradle.kts                                        | 1 -
 .../jetbrains/kotlin/test/utils/ReplacingSourceTransformer.kt    | 0
 .../org/jetbrains/kotlin/test/utils/TransformersFunctions.kt     | 0
 plugins/kapt3/kapt3-cli/build.gradle.kts                         | 1 +
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename compiler/{tests-common-new => test-infrastructure-utils}/tests/org/jetbrains/kotlin/test/utils/ReplacingSourceTransformer.kt (100%)
 rename compiler/{tests-common-new => test-infrastructure-utils}/tests/org/jetbrains/kotlin/test/utils/TransformersFunctions.kt (100%)

diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 655829eb90a..3656868f665 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -24,7 +24,6 @@ dependencies {
     testApi(projectTests(":compiler:tests-common"))
     testApi(projectTests(":compiler:fir:raw-fir:psi2fir"))
     testApi(projectTests(":compiler:fir:raw-fir:light-tree2fir"))
-    testApi(projectTests(":compiler:fir:fir2ir"))
     testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
     testApi(projectTests(":generators:test-generator"))
     testApi(project(":compiler:ir.ir2cfg"))
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/ReplacingSourceTransformer.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/utils/ReplacingSourceTransformer.kt
similarity index 100%
rename from compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/ReplacingSourceTransformer.kt
rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/utils/ReplacingSourceTransformer.kt
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/TransformersFunctions.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/utils/TransformersFunctions.kt
similarity index 100%
rename from compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/TransformersFunctions.kt
rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/utils/TransformersFunctions.kt
diff --git a/plugins/kapt3/kapt3-cli/build.gradle.kts b/plugins/kapt3/kapt3-cli/build.gradle.kts
index adb81695610..18242223601 100644
--- a/plugins/kapt3/kapt3-cli/build.gradle.kts
+++ b/plugins/kapt3/kapt3-cli/build.gradle.kts
@@ -8,6 +8,7 @@ dependencies {
 
     compileOnly(intellijCore())
 
+    testImplementation(intellijCore())
     testApi(projectTests(":compiler:tests-common"))
     testApi(projectTests(":compiler"))
     testApi(commonDependency("junit:junit"))