Move deprecated kotlin-runtime and reduced runtime for tests into stdlib
Rename mock-runtime-for-test project to kotlin-stdlib:jvm-minimal-for-test
This commit is contained in:
committed by
Stanislav Erokhin
parent
c796e5338b
commit
5c0cc5f799
@@ -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",
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
@@ -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()) {
|
||||
|
||||
Reference in New Issue
Block a user