Remove warning for running the compiler under Java 6/7

Now the compiler won't even start, so no need to check this manually.
This commit is contained in:
Dmitry Jemerov
2017-04-07 18:11:48 +02:00
parent 5a7278b856
commit 406714a1f4
9 changed files with 1 additions and 25 deletions
@@ -74,7 +74,6 @@ public abstract class AbstractCliTest extends TestCaseWithTmpdir {
.replace("expected version is " + JvmMetadataVersion.INSTANCE, "expected version is $ABI_VERSION$")
.replace("expected version is " + JsMetadataVersion.INSTANCE, "expected version is $ABI_VERSION$")
.replace("\\", "/")
.replaceAll("^.+running the Kotlin compiler under Java 6 or 7 is unsupported and will no longer be possible in a future update\\.\n", "")
.replace(KotlinCompilerVersion.VERSION, "$VERSION$");
return normalizedOutputWithoutExitCode + exitCode;
@@ -43,7 +43,6 @@ public abstract class CompilerSmokeTestBase extends KotlinIntegrationTestBase {
javaArgs.add("org.jetbrains.kotlin.cli.jvm.K2JVMCompiler");
Collections.addAll(javaArgs, arguments);
javaArgs.add("-Xskip-java-check");
return run(logName, ArrayUtil.toStringArray(javaArgs));
}
@@ -84,7 +84,7 @@ abstract class AbstractMultiPlatformIntegrationTest : KtUsefulTestCase() {
private fun CLICompiler<*>.compile(sources: List<File>, vararg additionalArguments: String): String = buildString {
val (output, exitCode) = AbstractCliTest.executeCompilerGrabOutput(
this@compile,
sources.map(File::getAbsolutePath) + listOf("-Xmulti-platform", "-Xskip-java-check") + additionalArguments
sources.map(File::getAbsolutePath) + listOf("-Xmulti-platform") + additionalArguments
)
appendln("Exit code: $exitCode")
appendln("Output:")