Restore logic of StandardScriptDefinition handling, fixes codegen tests

This commit is contained in:
Ilya Chernikov
2016-06-07 18:41:36 +02:00
parent e8c13882b4
commit 7153ea61d8
2 changed files with 4 additions and 2 deletions
@@ -115,6 +115,8 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
return ExitCode.OK
}
configuration.add(JVMConfigurationKeys.SCRIPT_DEFINITIONS, StandardScriptDefinition)
if (arguments.skipMetadataVersionCheck) {
JvmMetadataVersion.skipCheck = true
}
@@ -143,10 +143,10 @@ class KotlinCoreEnvironment private constructor(
if (configuration.get(JVMConfigurationKeys.LOAD_SCRIPT_CONFIGS) ?: false)
loadScriptConfigsFromProjectRoot(File(project.basePath ?: ".")).let { configs ->
val kotlinEnvVars = generateKotlinScriptClasspathEnvVars(project)
configs.map { KotlinConfigurableScriptDefinition(it, kotlinEnvVars) } + StandardScriptDefinition
configs.map { KotlinConfigurableScriptDefinition(it, kotlinEnvVars) }
}
else null
?: listOf(StandardScriptDefinition)
?: emptyList()
})
KotlinScriptExtraImportsProvider.getInstance(project)?.run {