Restore logic of StandardScriptDefinition handling, fixes codegen tests
This commit is contained in:
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user