Change dependencies resolver API - it gets message reporter and returns Future now

2016-07-28 15:06:31 +02:00
parent 464445c260
commit 3b1e7494b8
2 changed files with 32 additions and 7 deletions
@@ -133,8 +133,9 @@ class TestKotlinScriptDependenciesResolver : ScriptDependenciesResolverEx {
    @AcceptedAnnotations(DependsOn::class, DependsOnTwo::class)
    override fun resolve(script: ScriptContents,
                         environment: Map<String, Any?>?,
+                         report: (ScriptDependenciesResolverEx.ReportSeverity, String, ScriptContents.Position?) -> Unit,
                         previousDependencies: KotlinScriptExternalDependencies?
-    ): KotlinScriptExternalDependencies?
+    ): Future<KotlinScriptExternalDependencies?>
    {
        val cp = script.annotations.flatMap {
            when (it) {
@@ -153,7 +154,7 @@ class TestKotlinScriptDependenciesResolver : ScriptDependenciesResolverEx {
        return object : KotlinScriptExternalDependencies {
            override val classpath: Iterable<File> = classpathFromClassloader() + cp
            override val imports: Iterable<String> = listOf("org.jetbrains.kotlin.scripts.DependsOn", "org.jetbrains.kotlin.scripts.DependsOnTwo")
-        }
+        }.asFuture()
    }

    private fun classpathFromClassloader(): List<File> =