Warn when running the compiler under Java 6 or 7

(cherry picked from commit 5537800)

Author: yole

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java

@@ -76,6 +76,9 @@ public abstract class CommonCompilerArguments implements Serializable {
     @Argument(value = "Xno-check-impl", description = "Do not check presence of 'impl' modifier in multi-platform projects")
     public boolean noCheckImpl;
 
+    @Argument(value = "Xskip-java-check", description = "Do not warn when running the compiler under Java 6 or 7")
+    public boolean noJavaVersionWarning;
+
     @Argument(value = "Xcoroutines=warn")
     public boolean coroutinesWarn;
 

compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java

@@ -22,10 +22,7 @@
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.util.concurrency.AppExecutorUtil;
 import com.intellij.util.concurrency.AppScheduledExecutorService;
-import com.sampullara.cli.Args;
-import kotlin.Pair;
 import kotlin.collections.ArraysKt;
-import kotlin.collections.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.fusesource.jansi.AnsiConsole;
 import org.jetbrains.annotations.NotNull;
@@ -159,6 +156,7 @@ public ExitCode exec(@NotNull MessageCollector messageCollector, @NotNull Servic
         }
 
         reportUnknownExtraFlags(messageCollector, arguments);
+        reportUnsupportedJavaVersion(messageCollector, arguments);
 
         GroupingMessageCollector groupingCollector = new GroupingMessageCollector(messageCollector);
 
@@ -352,6 +350,16 @@ private void reportUnknownExtraFlags(@NotNull MessageCollector collector, @NotNu
         }
     }
 
+    private void reportUnsupportedJavaVersion(MessageCollector collector, A arguments) {
+        if (!SystemInfo.isJavaVersionAtLeast("1.8") && !arguments.noJavaVersionWarning) {
+            collector.report(
+                    CompilerMessageSeverity.STRONG_WARNING,
+                    "Running the Kotlin compiler under Java 6 or 7 is unsupported and will no longer be possible in a future update.",
+                    CompilerMessageLocation.NO_LOCATION
+            );
+        }
+    }
+
     @NotNull
     protected abstract ExitCode doExecute(
             @NotNull A arguments,

compiler/testData/cli/js/jsExtraHelp.out

@@ -6,8 +6,9 @@ where advanced options include:
   -Xplugin <path>            Load plugins from the given classpath
   -Xmulti-platform           Enable experimental language support for multi-platform projects
   -Xno-check-impl            Do not check presence of 'impl' modifier in multi-platform projects
+  -Xskip-java-check          Do not warn when running the compiler under Java 6 or 7
   -Xcoroutines={enable|warn|error} Enable coroutines or report warnings or errors on declarations and use sites of 'suspend' modifier
 
 
 Advanced options are non-standard and may be changed or removed without any notice.
-OK
+OK

compiler/testData/cli/js/version.out

@@ -1,2 +1,3 @@
 info: Kotlin Compiler version $VERSION$
+warning: running the Kotlin compiler under Java 6 or 7 is unsupported and will no longer be possible in a future update.
 OK

compiler/testData/cli/jvm/extraHelp.out

@@ -18,6 +18,7 @@ where advanced options include:
   -Xplugin <path>            Load plugins from the given classpath
   -Xmulti-platform           Enable experimental language support for multi-platform projects
   -Xno-check-impl            Do not check presence of 'impl' modifier in multi-platform projects
+  -Xskip-java-check          Do not warn when running the compiler under Java 6 or 7
   -Xcoroutines={enable|warn|error} Enable coroutines or report warnings or errors on declarations and use sites of 'suspend' modifier
 
 

compiler/testData/cli/jvm/unknownExtraFlags.out

@@ -1,4 +1,5 @@
 warning: flag is not supported by this version of the compiler: -Xabcdefghijklm
 warning: flag is not supported by this version of the compiler: -Xnopqrstuvwxyz
 warning: flag is not supported by this version of the compiler: -XXxxxxxxxxxxxx
+warning: running the Kotlin compiler under Java 6 or 7 is unsupported and will no longer be possible in a future update.
 OK

compiler/testData/cli/jvm/version.out

@@ -1,2 +1,3 @@
 info: Kotlin Compiler version $VERSION$
+warning: running the Kotlin compiler under Java 6 or 7 is unsupported and will no longer be possible in a future update.
 OK

compiler/tests-common/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java

@@ -87,6 +87,9 @@ protected String normalizeOutput(@NotNull File testDataDir, @NotNull String cont
         content = normalizePath(content, getKotlinProjectHome(), "[KotlinProjectHome]");
         content = content.replaceAll(Pattern.quote(KotlinCompilerVersion.VERSION), "[KotlinVersion]");
         content = StringUtil.convertLineSeparators(content);
+        content = Pattern.compile("^.+running the Kotlin compiler under Java 6 or 7 is unsupported and will no longer be possible in a future update\\.\n", Pattern.MULTILINE)
+                .matcher(content)
+                .replaceAll("");
         return content;
     }
 

compiler/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java

@@ -74,12 +74,13 @@ public static String getNormalizedCompilerOutput(
             @NotNull BinaryVersion version
     ) {
         String testDataAbsoluteDir = new File(testDataDir).getAbsolutePath();
-        String normalizedOutputWithoutExitCode = pureOutput
+        String normalizedOutputWithoutExitCode = StringUtil.convertLineSeparators(pureOutput)
                 .replace(testDataAbsoluteDir, "$TESTDATA_DIR$")
                 .replace(FileUtil.toSystemIndependentName(testDataAbsoluteDir), "$TESTDATA_DIR$")
                 .replace(PathUtil.getKotlinPathsForDistDirectory().getHomePath().getAbsolutePath(), "$PROJECT_DIR$")
                 .replace("expected version is " + version, "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;

compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTestBase.java

@@ -43,6 +43,7 @@ protected int runCompiler(String logName, String... arguments) throws Exception
         javaArgs.add("org.jetbrains.kotlin.cli.jvm.K2JVMCompiler");
 
         Collections.addAll(javaArgs, arguments);
+        javaArgs.add("-Xskip-java-check");
 
         return run(logName, ArrayUtil.toStringArray(javaArgs));
     }

compiler/tests/org/jetbrains/kotlin/multiplatform/AbstractMultiPlatformIntegrationTest.kt

@@ -39,7 +39,7 @@ abstract class AbstractMultiPlatformIntegrationTest : KtUsefulTestCase() {
 
         val result = buildString {
             val (commonOutput, commonExitCode) = AbstractCliTest.executeCompilerGrabOutput(K2MetadataCompiler(), listOf(
-                    commonSrc.absolutePath, "-d", commonDest.absolutePath
+                    commonSrc.absolutePath, "-d", commonDest.absolutePath, "-Xskip-java-check"
             ))
             appendln("-- Common --")
             appendln("Exit code: $commonExitCode")
@@ -50,7 +50,7 @@ abstract class AbstractMultiPlatformIntegrationTest : KtUsefulTestCase() {
                 val (jvmOutput, jvmExitCode) = AbstractCliTest.executeCompilerGrabOutput(K2JVMCompiler(), listOf(
                         jvmSrc.absolutePath, commonSrc.absolutePath,
                         "-d", jvmDest.absolutePath,
-                        "-Xmulti-platform"
+                        "-Xmulti-platform", "-Xskip-java-check"
                 ))
                 appendln("-- JVM --")
                 appendln("Exit code: $jvmExitCode")
@@ -62,7 +62,7 @@ abstract class AbstractMultiPlatformIntegrationTest : KtUsefulTestCase() {
                 val (jsOutput, jsExitCode) = AbstractCliTest.executeCompilerGrabOutput(K2JSCompiler(), listOf(
                         jsSrc.absolutePath, commonSrc.absolutePath,
                         "-output", jsDest.absolutePath,
-                        "-Xmulti-platform"
+                        "-Xmulti-platform", "-Xskip-java-check"
                 ))
                 appendln("-- JS --")
                 appendln("Exit code: $jsExitCode")