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

Use JvmTarget.DEFAULT instead of JVM_1_6 where applicable

Browse Source
This commit is contained in:
Alexander Udalov
2019-03-04 19:28:00 +01:00
parent a6b7aa3257
commit c7c377e1b1
7 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJvmCompilerImpl.kt
+1 -5
View File
@@ -208,16 +208,12 @@ class KJvmCompilerImpl(val hostConfiguration: ScriptingHostConfiguration) : KJvm
reportingState.currentArguments = baseArguments
return org.jetbrains.kotlin.config.CompilerConfiguration().apply {
// default value differs from the argument'ss default (see #KT-29405 and #KT-29319)
put(JVMConfigurationKeys.JVM_TARGET, JvmTarget.JVM_1_8)
put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector)
setupCommonArguments(baseArguments)
setupJvmSpecificArguments(baseArguments)
// default value differs from the argument'ss default (see #KT-29405 and #KT-29319)
// Default value differs from the argument's default (see #KT-29405 and #KT-29319)
put(JVMConfigurationKeys.JVM_TARGET, JvmTarget.JVM_1_8)
val jdkHomeFromConfigurations = scriptCompilationConfiguration.getNoDefault(ScriptCompilationConfiguration.jvm.jdkHome)