azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Rename mock-runtime-for-test project to kotlin-stdlib:jvm-minimal-for-test
This commit is contained in:
Ilya Gorbunov
2018-02-06 08:51:17 +03:00
committed by Stanislav Erokhin
parent c796e5338b
commit 5c0cc5f799
11 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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()) {