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

Validate "-jvm-target" value in CLI, improve message

Browse Source
This commit is contained in:
Alexander Udalov
2016-06-15 14:17:54 +03:00
parent 02fd5371aa
commit da332d1a27
11 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+11 -2
View File
@@ -128,8 +128,17 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
if (friendPaths != null) {
configuration.put(JVMConfigurationKeys.FRIEND_PATHS, friendPaths)
}
if ("1.8".equals(arguments.jvmTarget)) {
configuration.put(JVMConfigurationKeys.JVM_8_TARGET, true)
if (arguments.jvmTarget != null) {
val jvmTarget = JvmTarget.fromString(arguments.jvmTarget)
if (jvmTarget != null) {
configuration.put(JVMConfigurationKeys.JVM_TARGET, jvmTarget)
}
else {
val errorMessage = "Unknown JVM target version: ${arguments.jvmTarget}\n" +
"Supported versions: ${JvmTarget.values().joinToString { it.string }}"
messageCollector.report(CompilerMessageSeverity.ERROR, errorMessage, CompilerMessageLocation.NO_LOCATION)
}
}
putAdvancedOptions(configuration, arguments)