diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 9e2bac7cd6c..862fb851b7f 100644 --- a/compiler/build.gradle.kts +++ b/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", diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java index bc0557dd9cb..165efcc0370 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java +++ b/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 diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java index b73fefc69db..4a4cacc4fef 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/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()) { diff --git a/gradle/project-schema.json b/gradle/project-schema.json index 7af242b423d..51666cb7789 100644 --- a/gradle/project-schema.json +++ b/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" diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index fa36e00f57b..e49aa057c6b 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/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() { diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 23d89ae72bd..e43c6952d96 100644 --- a/js/js.tests/build.gradle.kts +++ b/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", diff --git a/prepare/mock-runtime-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts similarity index 91% rename from prepare/mock-runtime-for-test/build.gradle.kts rename to libraries/stdlib/jvm-minimal-for-test/build.gradle.kts index 45a942afb29..79978380e95 100644 --- a/prepare/mock-runtime-for-test/build.gradle.kts +++ b/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)) diff --git a/libraries/tools/runtime/build.gradle b/libraries/stdlib/runtime/build.gradle similarity index 100% rename from libraries/tools/runtime/build.gradle rename to libraries/stdlib/runtime/build.gradle diff --git a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt index 4972289e974..73ced82d200 100644 --- a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt +++ b/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") diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts index 69fadea67c4..639e5d0a0bb 100644 --- a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts +++ b/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) diff --git a/settings.gradle b/settings.gradle index 328ea680806..0fb07ec5a3d 100644 --- a/settings.gradle +++ b/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