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

Always use default 1.6 build target unless of 'jvm-target' option

Browse Source
This commit is contained in:
Mikhael Bogdanov
2016-12-12 10:33:33 +01:00
parent ef662a5679
commit dc5c3a478c
14 changed files with 27 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java
-3
View File
@@ -111,9 +111,6 @@ public class K2JVMCompilerArguments extends CommonCompilerArguments {
@Argument(value = "Xload-builtins-from-dependencies", description = "Load definitions of built-in declarations from module dependencies, instead of from the compiler")
public boolean loadBuiltInsFromDependencies;
@Argument(value = "Xinterface-compatibility", description = "Generate DefaultImpls classes for interfaces in JVM target bytecode version 1.8 for binary compatibility with 1.6")
public boolean interfaceCompatibility;
// Paths to output directories for friend modules.
public String[] friendPaths;
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+6 -12
View File
@@ -133,7 +133,12 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
if (arguments.jvmTarget != null) {
val jvmTarget = JvmTarget.fromString(arguments.jvmTarget)
if (jvmTarget != null) {
configuration.put(JVMConfigurationKeys.JVM_TARGET, jvmTarget)
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)
}
else {
val errorMessage = "Unknown JVM target version: ${arguments.jvmTarget}\n" +
@@ -144,17 +149,6 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
configuration.put(JVMConfigurationKeys.PARAMETERS_METADATA, arguments.javaParameters)
if (arguments.interfaceCompatibility) {
val target = configuration.get(JVMConfigurationKeys.JVM_TARGET)
if (target != JvmTarget.JVM_1_8) {
val errorMessage = "The -Xinterface-compatibility option has effect only for JVM target bytecode version 1.8."
messageCollector.report(CompilerMessageSeverity.WARNING, errorMessage, CompilerMessageLocation.NO_LOCATION)
}
else {
configuration.put(JVMConfigurationKeys.INTERFACE_COMPATIBILITY, true)
}
}
putAdvancedOptions(configuration, arguments)
messageCollector.report(CompilerMessageSeverity.LOGGING, "Configuring the compilation environment", CompilerMessageLocation.NO_LOCATION)