From 62514e126d7ad9d594bf70938aeb6031076c6332 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Thu, 12 Jan 2017 16:03:11 +0100 Subject: [PATCH] Enable jvm 1.8 platform in cli --- .../cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt | 7 +------ compiler/testData/cli/jvm/jvm8Target.out | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt index 84e9a3d5b98..1853321e02a 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -129,12 +129,7 @@ class K2JVMCompiler : CLICompiler() { if (arguments.jvmTarget != null) { val jvmTarget = JvmTarget.fromString(arguments.jvmTarget) if (jvmTarget != null) { - if (jvmTarget == JvmTarget.JVM_1_8) { - val warning = "The -jvm-target option has no effect yet" - messageCollector.report(CompilerMessageSeverity.WARNING, warning, CompilerMessageLocation.NO_LOCATION) - } - //use default target for now - //configuration.put(JVMConfigurationKeys.JVM_TARGET, jvmTarget) + configuration.put(JVMConfigurationKeys.JVM_TARGET, jvmTarget) } else { val errorMessage = "Unknown JVM target version: ${arguments.jvmTarget}\n" + diff --git a/compiler/testData/cli/jvm/jvm8Target.out b/compiler/testData/cli/jvm/jvm8Target.out index 05e7e8e7841..a0aba9318ad 100644 --- a/compiler/testData/cli/jvm/jvm8Target.out +++ b/compiler/testData/cli/jvm/jvm8Target.out @@ -1,2 +1 @@ -warning: the -jvm-target option has no effect yet OK \ No newline at end of file