Refactor script dependnecies template and resolver interfaces:
- get rid of obsolete interfaces and annotations - rename actual resolver interface to ScriptDependenciesResolver - make ScriptDependenciesResolverEx interface compatible with the one from 1.1-M01 to be able to support both on the provider side - add possibility to override file patter in the script template provider - construct resolver lazily, if possible
This commit is contained in:
@@ -82,7 +82,7 @@ class ScriptTest2 {
|
||||
environment: Map<String, Any?>? = null,
|
||||
runIsolated: Boolean = true,
|
||||
suppressOutput: Boolean = false): Class<*>? =
|
||||
compileScriptImpl("compiler/testData/script/" + scriptPath, KotlinScriptDefinitionFromTemplate(scriptBase, null, environment), runIsolated, suppressOutput)
|
||||
compileScriptImpl("compiler/testData/script/" + scriptPath, KotlinScriptDefinitionFromTemplate(scriptBase, null, null, environment), runIsolated, suppressOutput)
|
||||
|
||||
private fun compileScriptImpl(
|
||||
scriptPath: String,
|
||||
@@ -126,14 +126,14 @@ class ScriptTest2 {
|
||||
}
|
||||
}
|
||||
|
||||
class TestKotlinScriptDependenciesResolver : ScriptDependenciesResolverEx {
|
||||
class TestKotlinScriptDependenciesResolver : ScriptDependenciesResolver {
|
||||
|
||||
private val kotlinPaths by lazy { PathUtil.getKotlinPathsForCompiler() }
|
||||
|
||||
@AcceptedAnnotations(DependsOn::class, DependsOnTwo::class)
|
||||
override fun resolve(script: ScriptContents,
|
||||
environment: Map<String, Any?>?,
|
||||
report: (ScriptDependenciesResolverEx.ReportSeverity, String, ScriptContents.Position?) -> Unit,
|
||||
report: (ScriptDependenciesResolver.ReportSeverity, String, ScriptContents.Position?) -> Unit,
|
||||
previousDependencies: KotlinScriptExternalDependencies?
|
||||
): Future<KotlinScriptExternalDependencies?>
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user