Move deprecated kotlin-runtime and reduced runtime for tests into stdlib

Rename mock-runtime-for-test project to kotlin-stdlib:jvm-minimal-for-test

compiler/build.gradle.kts

@@ -31,7 +31,7 @@ val depDistProjects = listOf(
 // TODO: it seems incomplete, find and add missing dependencies
 val testDistProjects = listOf(
         "", // for root project
-        ":prepare:mock-runtime-for-test",
+        ":kotlin-stdlib:jvm-minimal-for-test",
         ":kotlin-compiler",
         ":kotlin-script-runtime",
         ":kotlin-stdlib",

compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java

@@ -37,8 +37,8 @@ public class ForTestCompileRuntime {
     }
 
     @NotNull
-    public static File mockRuntimeJarForTests() {
-        return assertExists(new File("dist/kotlin-mock-runtime-for-test.jar"));
+    public static File minimalRuntimeJarForTests() {
+        return assertExists(new File("dist/kotlin-stdlib-minimal-for-test.jar"));
     }
 
     @NotNull

compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java

@@ -583,7 +583,7 @@ public class KotlinTestUtils {
             JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.kotlinTestJarForTests());
         }
         else if (configurationKind.getWithMockRuntime()) {
-            JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.mockRuntimeJarForTests());
+            JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.minimalRuntimeJarForTests());
             JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.scriptRuntimeJarForTests());
         }
         if (configurationKind.getWithReflection()) {

gradle/project-schema.json

@@ -4772,7 +4772,7 @@
             "reporting": "org.gradle.api.reporting.ReportingExtension"
         }
     },
-    ":prepare:mock-runtime-for-test": {
+    ":kotlin-stdlib:jvm-minimal-for-test": {
         "conventions": {
             "base": "org.gradle.api.plugins.BasePluginConvention",
             "java": "org.gradle.api.plugins.JavaPluginConvention"

jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java

@@ -64,7 +64,7 @@ public abstract class AbstractKotlinJpsBuildTestCase extends BaseKotlinJpsBuildT
     }
 
     protected JpsLibrary addKotlinMockRuntimeDependency() {
-        return addDependency("kotlin-mock-runtime", ForTestCompileRuntime.mockRuntimeJarForTests());
+        return addDependency("kotlin-mock-runtime", ForTestCompileRuntime.minimalRuntimeJarForTests());
     }
 
     protected JpsLibrary addKotlinStdlibDependency() {

js/js.tests/build.gradle.kts

@@ -50,7 +50,7 @@ sourceSets {
 
 val testDistProjects = listOf(
         "", // for root project
-        ":prepare:mock-runtime-for-test",
+        ":kotlin-stdlib:jvm-minimal-for-test",
         ":kotlin-compiler",
         ":kotlin-script-runtime",
         ":kotlin-stdlib",

libraries/stdlib/jvm-minimal-for-test/build.gradle.kts

@@ -8,7 +8,7 @@ jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
-    compile(projectDist(":kotlin-stdlib"))
+    compileOnly(project(":kotlin-stdlib"))
 }
 
 sourceSets {
@@ -53,4 +53,4 @@ val jar = runtimeJar {
 
 val distDir: String by rootProject.extra
 
-dist(targetName = "kotlin-mock-runtime-for-test.jar", targetDir = File(distDir))
+dist(targetName = "kotlin-stdlib-minimal-for-test.jar", targetDir = File(distDir))

libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt

@@ -29,7 +29,7 @@ class RuntimePublicAPITest {
     val testName = TestName()
 
     @Test fun kotlinRuntime() {
-        snapshotAPIAndCompare("../../tools/runtime/build/libs", "kotlin-runtime", listOf("../runtime-declarations.json"), listOf("kotlin.jvm.internal"))
+        snapshotAPIAndCompare("../../stdlib/runtime/build/libs", "kotlin-runtime", listOf("../runtime-declarations.json"), listOf("kotlin.jvm.internal"))
     }
 
     //@Ignore("No more original stdlib jar is produced")

plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts

@@ -40,7 +40,7 @@ ideaPlugin {
 }
 
 projectTest {
-    dependsOn(":prepare:mock-runtime-for-test:dist")
+    dependsOn(":kotlin-stdlib:jvm-minimal-for-test:dist")
     workingDir = rootDir
     doFirst {
         systemProperty("idea.home.path", intellijRootDir().canonicalPath)

settings.gradle

@@ -109,13 +109,13 @@ include ":kotlin-build-common",
         ":kotlin-stdlib-jdk7",
         ":kotlin-stdlib-jdk8",
         ":kotlin-stdlib:samples",
+        ":kotlin-stdlib:jvm-minimal-for-test",
         ":prepare:build.version",
         ":kotlin-build-common",
         ":prepare:formatter",
         ":prepare:ide-lazy-resolver",
         ":prepare:idea-plugin",
         ":android-lint",
-        ":prepare:mock-runtime-for-test",
         ":kotlin-compiler",
         ":kotlin-compiler-embeddable",
         ":kotlin-compiler-client-embeddable",
@@ -159,7 +159,7 @@ include ":kotlin-build-common",
 
 rootProject.name = "kotlin"
 
-project(':kotlin-runtime').projectDir = "$rootDir/libraries/tools/runtime" as File
+project(':kotlin-runtime').projectDir = "$rootDir/libraries/stdlib/runtime" as File
 project(':kotlin-script-runtime').projectDir = "$rootDir/libraries/tools/script-runtime" as File
 project(':kotlin-test').projectDir = "$rootDir/libraries/kotlin.test" as File
 project(':kotlin-test:kotlin-test-common').projectDir = "$rootDir/libraries/kotlin.test/common" as File
@@ -177,6 +177,7 @@ project(':kotlin-stdlib-jre8').projectDir = "$rootDir/libraries/stdlib/jre8" as
 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-reflect').projectDir = "$rootDir/libraries/reflect" as File
 project(':kotlin-reflect-api').projectDir = "$rootDir/libraries/reflect/api" as File
 project(':kotlin-compiler').projectDir = "$rootDir/prepare/compiler" as File