AsyncDependenciesResolver: provide implementation for sync resolve

compiler/frontend.script/src/org/jetbrains/kotlin/script/AsyncDependencyResolverWrapper.kt

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.script
+
+import kotlinx.coroutines.experimental.runBlocking
+import kotlin.script.dependencies.DependenciesResolver
+import kotlin.script.dependencies.Environment
+import kotlin.script.dependencies.ScriptContents
+import kotlin.script.dependencies.experimental.AsyncDependenciesResolver
+
+// wraps AsyncDependenciesResolver to provide implementation for synchronous DependenciesResolver::resolve
+class AsyncDependencyResolverWrapper(private val delegate: AsyncDependenciesResolver): AsyncDependenciesResolver {
+
+    override fun resolve(
+            scriptContents: ScriptContents, environment: Environment
+    ): DependenciesResolver.ResolveResult
+            = runBlocking { delegate.resolveAsync(scriptContents, environment) }
+
+
+    suspend override fun resolveAsync(
+            scriptContents: ScriptContents, environment: Environment
+    ): DependenciesResolver.ResolveResult
+            = delegate.resolveAsync(scriptContents, environment)
+}

compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt

@@ -29,6 +29,7 @@ import kotlin.reflect.KParameter
 import kotlin.reflect.full.memberFunctions
 import kotlin.script.dependencies.DependenciesResolver
 import kotlin.script.dependencies.ScriptDependenciesResolver
+import kotlin.script.dependencies.experimental.AsyncDependenciesResolver
 import kotlin.script.templates.AcceptedAnnotations
 
 open class KotlinScriptDefinitionFromAnnotatedTemplate(
@@ -68,7 +69,11 @@ open class KotlinScriptDefinitionFromAnnotatedTemplate(
         } ?: return null
 
         val resolver = instantiateResolver(defAnn.resolver)
-        return if (resolver is DependenciesResolver) resolver else resolver?.let(::ApiChangeDependencyResolverWrapper)
+        return when (resolver) {
+            is AsyncDependenciesResolver -> AsyncDependencyResolverWrapper(resolver)
+            is DependenciesResolver -> resolver
+            else -> resolver?.let(::ApiChangeDependencyResolverWrapper)
+        }
     }
 
     private fun <T : Any> instantiateResolver(resolverClass: KClass<T>): T? {