From 8baf570ee79abfbb155e223ee3e9efcdbf7c35c2 Mon Sep 17 00:00:00 2001
From: Steffi Stumpos <stumpos@fb.com>
Date: Fri, 16 Apr 2021 15:57:46 -0600
Subject: [PATCH] Build: Publish the new compiler test infrastructure

---
 buildSrc/src/main/kotlin/embeddable.kt        |  1 -
 .../jvm-minimal-for-test/build.gradle.kts     | 17 ++++---------
 prepare/compiler/build.gradle.kts             |  2 +-
 .../build.gradle.kts                          | 24 ++++++++++---------
 settings.gradle                               |  4 ++--
 5 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/buildSrc/src/main/kotlin/embeddable.kt b/buildSrc/src/main/kotlin/embeddable.kt
index f6f865e49f7..648aeb25d45 100644
--- a/buildSrc/src/main/kotlin/embeddable.kt
+++ b/buildSrc/src/main/kotlin/embeddable.kt
@@ -93,7 +93,6 @@ fun Project.compilerDummyForDependenciesRewriting(
         exclude(packagesToExcludeFromDummy)
         body()
     }
-
 const val COMPILER_DUMMY_JAR_CONFIGURATION_NAME = "compilerDummyJar"
 
 fun Project.compilerDummyJar(task: TaskProvider<out Jar>, body: Jar.() -> Unit = {}) {
diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
index 38cd5f2ac1f..9bda8798882 100644
--- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
+++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
@@ -73,21 +73,12 @@ tasks.withType<KotlinCompile> {
     }
 }
 
+publish()
+
 val jar = runtimeJar {
-    archiveFileName.set("kotlin-stdlib-minimal-for-test.jar")
     dependsOn(builtins)
     from(provider { zipTree(builtins.singleFile) }) { include("kotlin/**") }
 }
 
-publishing {
-    publications {
-        create<MavenPublication>("internal") {
-            artifactId = "kotlin-stdlib-minimal-for-test"
-            artifact(jar.get())
-        }
-    }
-
-    repositories {
-        maven("${rootProject.buildDir}/internal/repo")
-    }
-}
+sourcesJar()
+javadocJar()
diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts
index 7c4c488e0aa..a3530a648c8 100644
--- a/prepare/compiler/build.gradle.kts
+++ b/prepare/compiler/build.gradle.kts
@@ -182,7 +182,7 @@ dependencies {
         sources(project(":kotlin-stdlib-js", configuration = "distSources"))
         sources(project(":kotlin-reflect", configuration = "sources"))
 
-        distStdlibMinimalForTests(project(":kotlin-stdlib:jvm-minimal-for-test"))
+        distStdlibMinimalForTests(project(":kotlin-stdlib-jvm-minimal-for-test"))
 
         distJSContents(project(":kotlin-stdlib-js", configuration = "distJs"))
         distJSContents(project(":kotlin-test:kotlin-test-js", configuration = "distJs"))
diff --git a/prepare/kotlin-compiler-internal-test-framework/build.gradle.kts b/prepare/kotlin-compiler-internal-test-framework/build.gradle.kts
index 6f57e54f2c7..5cd7f1749f2 100644
--- a/prepare/kotlin-compiler-internal-test-framework/build.gradle.kts
+++ b/prepare/kotlin-compiler-internal-test-framework/build.gradle.kts
@@ -2,20 +2,22 @@ plugins {
     java
 }
 
-val embedded by configurations
+val compilerModules: Array<String> by rootProject.extra
 
 dependencies {
-    embedded(projectTests(":compiler:tests-common")) { isTransitive = false }
+    compilerModules.forEach {
+        embedded(project(it)) { isTransitive = false }
+    }
+    embedded(projectTests(":compiler:tests-common-jvm6")) { isTransitive = false }
+    embedded(projectTests(":compiler:test-infrastructure")) { isTransitive = false }
+    embedded(projectTests(":compiler:test-infrastructure-utils")) { isTransitive = false }
+    embedded(projectTests(":compiler:tests-compiler-utils")) { isTransitive = false }
+    embedded(projectTests(":compiler:tests-common-new")) { isTransitive = false }
+    embedded(protobufFull())
+    embedded(kotlinBuiltins())
 }
 
 publish()
-
 runtimeJar()
-
-sourcesJar {
-    from {
-        project(":compiler:tests-common").sourceSets["test"].allSource
-    }
-}
-
-javadocJar()
+sourcesJar()
+javadocJar()
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index bd060b255c9..57d6a11951b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -436,7 +436,7 @@ if (buildProperties.inJpsBuildIdeaSync) {
             ":kotlin-stdlib-jdk7",
             ":kotlin-stdlib-jdk8",
             ":kotlin-stdlib:samples",
-            ":kotlin-stdlib:jvm-minimal-for-test",
+            ":kotlin-stdlib-jvm-minimal-for-test",
             ":tools:binary-compatibility-validator",
             ":tools:kotlin-stdlib-gen",
 
@@ -454,7 +454,7 @@ if (buildProperties.inJpsBuildIdeaSync) {
     project(':kotlin-stdlib-jdk7').projectDir = "$rootDir/libraries/stdlib/jdk7" as File
     project(':kotlin-stdlib-jdk8').projectDir = "$rootDir/libraries/stdlib/jdk8" as File
     project(':kotlin-stdlib:samples').projectDir = "$rootDir/libraries/stdlib/samples" as File
-    project(":kotlin-stdlib:jvm-minimal-for-test").projectDir = "$rootDir/libraries/stdlib/jvm-minimal-for-test" as File
+    project(":kotlin-stdlib-jvm-minimal-for-test").projectDir = "$rootDir/libraries/stdlib/jvm-minimal-for-test" as File
 
     project(':tools:binary-compatibility-validator').projectDir = "$rootDir/libraries/tools/binary-compatibility-validator" as File
     project(':tools:kotlin-stdlib-gen').projectDir = "$rootDir/libraries/tools/kotlin-stdlib-gen" as File