Implement and use helpers for economical classpath update in script configs

This commit is contained in:
Ilya Chernikov
2019-01-15 17:48:16 +01:00
parent c7e5ad861c
commit 2bb5e8f51f
5 changed files with 44 additions and 21 deletions
@@ -30,10 +30,7 @@ import kotlin.script.experimental.host.FileScriptSource
import kotlin.script.experimental.host.ScriptingHostConfiguration
import kotlin.script.experimental.host.configurationDependencies
import kotlin.script.experimental.host.createCompilationConfigurationFromTemplate
import kotlin.script.experimental.jvm.JvmDependency
import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
import kotlin.script.experimental.jvm.dependenciesFromCurrentContext
import kotlin.script.experimental.jvm.jvm
import kotlin.script.experimental.jvm.*
private const val testDataPath = "compiler/testData/script/cliCompilation"
@@ -136,7 +133,7 @@ object TestScriptWithRequireConfiguration : ScriptCompilationConfiguration(
}
ScriptCompilationConfiguration(context.compilationConfiguration) {
if (sources?.isNotEmpty() == true) importScripts.append(sources)
if (deps?.isNotEmpty() == true) dependencies.append(JvmDependency(deps))
if (deps != null) updateClasspath(deps)
}.asSuccess()
}
}