From bee8c0bb9096baaccce14c281312cf7ff2d01344 Mon Sep 17 00:00:00 2001
From: Nikita Bobko <nikita.bobko@jetbrains.com>
Date: Fri, 7 May 2021 19:59:04 +0200
Subject: [PATCH] Publish :compiler:test-infrastructure for ide

---
 build.gradle.kts                                          | 1 +
 buildSrc/src/main/kotlin/artifacts.kt                     | 8 +++++---
 .../build.gradle.kts                                      | 2 +-
 .../build.gradle.kts                                      | 2 +-
 .../kotlin-build-common-tests-for-ide/build.gradle.kts    | 2 +-
 .../kotlin-compiler-tests-for-ide/build.gradle.kts        | 3 +++
 settings.gradle                                           | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 prepare/ide-plugin-dependencies/kotlin-compiler-tests-for-ide/build.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index 3a95329412a..9692403d2d2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -968,6 +968,7 @@ tasks {
                 ":prepare:ide-plugin-dependencies:compiler-components-for-jps:publish",
                 ":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-for-ide:publish",
                 ":prepare:ide-plugin-dependencies:lombok-compiler-plugin-for-ide:publish",
+                ":prepare:ide-plugin-dependencies:kotlin-compiler-tests-for-ide:publish",
                 ":kotlin-script-runtime:publish",
                 ":kotlin-script-util:publish",
                 ":kotlin-scripting-common:publish",
diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt
index a18492121fe..155a9d64b61 100644
--- a/buildSrc/src/main/kotlin/artifacts.kt
+++ b/buildSrc/src/main/kotlin/artifacts.kt
@@ -274,13 +274,15 @@ fun Project.publishProjectJars(projects: List<String>, libraryDependencies: List
     javadocJar()
 }
 
-fun Project.publishTestJar(projectName: String) {
+fun Project.publishTestJar(projects: List<String>) {
     apply<JavaPlugin>()
 
     val fatJarContents by configurations.creating
 
     dependencies {
-        fatJarContents(project(projectName, configuration = "tests-jar")) { isTransitive = false }
+        for (projectName in projects) {
+            fatJarContents(project(projectName, configuration = "tests-jar")) { isTransitive = false }
+        }
     }
 
     publish()
@@ -297,7 +299,7 @@ fun Project.publishTestJar(projectName: String) {
 
     sourcesJar {
         from {
-            project(projectName).testSourceSet.allSource
+            projects.map { project(it).testSourceSet.allSource }
         }
     }
 
diff --git a/prepare/ide-plugin-dependencies/allopen-compiler-plugin-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/allopen-compiler-plugin-tests-for-ide/build.gradle.kts
index d557d3c3f0d..bd54a23bc6e 100644
--- a/prepare/ide-plugin-dependencies/allopen-compiler-plugin-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/allopen-compiler-plugin-tests-for-ide/build.gradle.kts
@@ -1,3 +1,3 @@
 idePluginDependency {
-    publishTestJar(":compiler:incremental-compilation-impl")
+    publishTestJar(listOf(":compiler:incremental-compilation-impl"))
 }
\ No newline at end of file
diff --git a/prepare/ide-plugin-dependencies/incremental-compilation-impl-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/incremental-compilation-impl-tests-for-ide/build.gradle.kts
index d557d3c3f0d..bd54a23bc6e 100644
--- a/prepare/ide-plugin-dependencies/incremental-compilation-impl-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/incremental-compilation-impl-tests-for-ide/build.gradle.kts
@@ -1,3 +1,3 @@
 idePluginDependency {
-    publishTestJar(":compiler:incremental-compilation-impl")
+    publishTestJar(listOf(":compiler:incremental-compilation-impl"))
 }
\ No newline at end of file
diff --git a/prepare/ide-plugin-dependencies/kotlin-build-common-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-build-common-tests-for-ide/build.gradle.kts
index 36b79a5752d..21033e830bf 100644
--- a/prepare/ide-plugin-dependencies/kotlin-build-common-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-build-common-tests-for-ide/build.gradle.kts
@@ -1,3 +1,3 @@
 idePluginDependency {
-    publishTestJar(":kotlin-build-common")
+    publishTestJar(listOf(":kotlin-build-common"))
 }
\ No newline at end of file
diff --git a/prepare/ide-plugin-dependencies/kotlin-compiler-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-tests-for-ide/build.gradle.kts
new file mode 100644
index 00000000000..0d584179112
--- /dev/null
+++ b/prepare/ide-plugin-dependencies/kotlin-compiler-tests-for-ide/build.gradle.kts
@@ -0,0 +1,3 @@
+idePluginDependency {
+    publishTestJar(listOf(":compiler:test-infrastructure", ":compiler:tests-common-new", ":compiler:test-infrastructure-utils"))
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index fe52ae0d781..132cebc465a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -369,7 +369,8 @@ include ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for
         ":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-for-ide",
         ":prepare:ide-plugin-dependencies:lombok-compiler-plugin-for-ide",
         ":prepare:ide-plugin-dependencies:tests-common-tests-for-ide",
-        ":prepare:ide-plugin-dependencies:compiler-components-for-jps"
+        ":prepare:ide-plugin-dependencies:compiler-components-for-jps",
+        ":prepare:ide-plugin-dependencies:kotlin-compiler-tests-for-ide"
 
 if (buildProperties.includeCidrPlugins) {
     logger.info("Including CIDR modules in settings.gradle")