From b0b2c046b2a55d85946e8cf2206ac861e0781b69 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Sun, 30 Jul 2017 18:15:41 +0300 Subject: [PATCH] script.runtime 1.1.4: IDE and compiler use 'kotlin.script.experimental' --- .../cli/common/script/CliScriptDependenciesProvider.kt | 2 +- .../kotlin/cli/common/script/CliScriptReportSink.kt | 2 +- .../kotlin/cli/jvm/repl/GenericCompilerState.kt | 2 +- .../kotlin/script/AsyncDependencyResolverWrapper.kt | 4 ++-- .../KotlinScriptDefinitionFromAnnotatedTemplate.kt | 4 ++-- .../org/jetbrains/kotlin/script/ScriptContentLoader.kt | 6 +++--- .../org/jetbrains/kotlin/script/ScriptReportSink.kt | 2 +- .../src/org/jetbrains/kotlin/script/legacyWrappers.kt | 10 +++++----- .../src/org/jetbrains/kotlin/script/scriptTemplate.kt | 3 --- .../script/scriptTemplateProviderExtensionPoint.kt | 2 +- .../jetbrains/kotlin/script/KotlinScriptDefinition.kt | 2 +- .../kotlin/script/ScriptDependenciesProvider.kt | 2 +- .../org/jetbrains/kotlin/codegen/CodegenTestCase.java | 2 +- .../org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt | 3 ++- .../org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt | 5 +++-- .../kotlin/idea/caches/resolve/ScriptModuleInfos.kt | 2 +- .../idea/highlighter/ScriptExternalHighlightingPass.kt | 2 +- .../kotlin/idea/core/script/IdeScriptReportSink.kt | 2 +- .../kotlin/idea/core/script/ScriptDependenciesCache.kt | 2 +- .../core/script/ScriptDependenciesFileAttribute.kt | 2 +- .../idea/core/script/ScriptDependenciesManager.kt | 2 +- .../idea/core/script/ScriptDependenciesUpdater.kt | 6 +++--- .../script/StandardKotlinScriptTemplateProvider.kt | 3 ++- 23 files changed, 36 insertions(+), 36 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/script/CliScriptDependenciesProvider.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/script/CliScriptDependenciesProvider.kt index 9a6aa5ac921..ee70cb93451 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/script/CliScriptDependenciesProvider.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/script/CliScriptDependenciesProvider.kt @@ -26,7 +26,7 @@ import java.io.File import java.util.concurrent.locks.ReentrantReadWriteLock import kotlin.concurrent.read import kotlin.concurrent.write -import kotlin.script.dependencies.ScriptDependencies +import kotlin.script.experimental.dependencies.ScriptDependencies class CliScriptDependenciesProvider( project: Project, diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/script/CliScriptReportSink.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/script/CliScriptReportSink.kt index 587e3e1b042..7a4ca0adbd9 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/script/CliScriptReportSink.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/script/CliScriptReportSink.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.script.ScriptReportSink -import kotlin.script.dependencies.ScriptReport +import kotlin.script.experimental.dependencies.ScriptReport class CliScriptReportSink(private val messageCollector: MessageCollector) : ScriptReportSink { override fun attachReports(scriptFile: VirtualFile, reports: List) { diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericCompilerState.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericCompilerState.kt index 758d9138c79..12af9e5b991 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericCompilerState.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericCompilerState.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.cli.jvm.repl.messages.DiagnosticMessageHolder import org.jetbrains.kotlin.descriptors.ScriptDescriptor import org.jetbrains.kotlin.psi.KtFile import java.util.concurrent.locks.ReentrantReadWriteLock -import kotlin.script.dependencies.ScriptDependencies +import kotlin.script.experimental.dependencies.ScriptDependencies class ReplCompilerStageHistory(private val state: GenericReplCompilerState) : BasicReplStageHistory(state.lock) { diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/AsyncDependencyResolverWrapper.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/AsyncDependencyResolverWrapper.kt index 10f3043908a..05b353cbf42 100644 --- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/AsyncDependencyResolverWrapper.kt +++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/AsyncDependencyResolverWrapper.kt @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.script import kotlinx.coroutines.experimental.runBlocking -import kotlin.script.dependencies.DependenciesResolver +import kotlin.script.experimental.dependencies.DependenciesResolver import kotlin.script.dependencies.Environment import kotlin.script.dependencies.ScriptContents -import kotlin.script.dependencies.experimental.AsyncDependenciesResolver +import kotlin.script.experimental.dependencies.AsyncDependenciesResolver // wraps AsyncDependenciesResolver to provide implementation for synchronous DependenciesResolver::resolve class AsyncDependencyResolverWrapper( diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt index dd435002bd5..0586765a73c 100644 --- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt +++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionFromAnnotatedTemplate.kt @@ -28,9 +28,9 @@ import kotlin.reflect.KClass import kotlin.reflect.KFunction import kotlin.reflect.KParameter import kotlin.reflect.full.memberFunctions -import kotlin.script.dependencies.DependenciesResolver +import kotlin.script.experimental.dependencies.DependenciesResolver import kotlin.script.dependencies.ScriptDependenciesResolver -import kotlin.script.dependencies.experimental.AsyncDependenciesResolver +import kotlin.script.experimental.dependencies.AsyncDependenciesResolver import kotlin.script.templates.AcceptedAnnotations open class KotlinScriptDefinitionFromAnnotatedTemplate( diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptContentLoader.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptContentLoader.kt index 9d8c657cf39..2e7e1186e3b 100644 --- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptContentLoader.kt +++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptContentLoader.kt @@ -25,10 +25,10 @@ import org.jetbrains.kotlin.psi.KtAnnotationEntry import org.jetbrains.kotlin.psi.KtFile import java.io.File import kotlin.reflect.KClass -import kotlin.script.dependencies.DependenciesResolver.ResolveResult.Failure +import kotlin.script.experimental.dependencies.DependenciesResolver.ResolveResult.Failure import kotlin.script.dependencies.ScriptContents -import kotlin.script.dependencies.ScriptDependencies -import kotlin.script.dependencies.ScriptReport +import kotlin.script.experimental.dependencies.ScriptDependencies +import kotlin.script.experimental.dependencies.ScriptReport class ScriptContentLoader(private val project: Project) { fun getScriptContents(scriptDefinition: KotlinScriptDefinition, file: VirtualFile) diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptReportSink.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptReportSink.kt index 3711109df0f..5a2041d11c7 100644 --- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptReportSink.kt +++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/ScriptReportSink.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.script import com.intellij.openapi.vfs.VirtualFile -import kotlin.script.dependencies.ScriptReport +import kotlin.script.experimental.dependencies.ScriptReport interface ScriptReportSink { fun attachReports(scriptFile: VirtualFile, reports: List) diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/legacyWrappers.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/legacyWrappers.kt index 3fb73c3809b..2b975e88cd3 100644 --- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/legacyWrappers.kt +++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/legacyWrappers.kt @@ -19,10 +19,10 @@ package org.jetbrains.kotlin.script import java.io.File -import kotlin.script.dependencies.DependenciesResolver +import kotlin.script.experimental.dependencies.DependenciesResolver import kotlin.script.dependencies.Environment -import kotlin.script.dependencies.ScriptDependencies -import kotlin.script.dependencies.ScriptReport +import kotlin.script.experimental.dependencies.ScriptDependencies +import kotlin.script.experimental.dependencies.ScriptReport interface LegacyResolverWrapper @@ -30,7 +30,7 @@ interface LegacyResolverWrapper @Deprecated("Compatibility with deprecated API") internal class LegacyPackageDependencyResolverWrapper( val legacyResolver: ScriptDependenciesResolver -) : kotlin.script.dependencies.DependenciesResolver, LegacyResolverWrapper { +) : kotlin.script.experimental.dependencies.DependenciesResolver, LegacyResolverWrapper { override fun resolve( scriptContents: kotlin.script.dependencies.ScriptContents, environment: Environment @@ -70,7 +70,7 @@ internal class LegacyPackageDependencyResolverWrapper( internal class ApiChangeDependencyResolverWrapper( override val delegate: kotlin.script.dependencies.ScriptDependenciesResolver -) : kotlin.script.dependencies.DependenciesResolver, +) : kotlin.script.experimental.dependencies.DependenciesResolver, DependencyResolverWrapper, LegacyResolverWrapper { override fun resolve( diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplate.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplate.kt index 08c865fc201..0be16d29ed9 100644 --- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplate.kt +++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplate.kt @@ -20,9 +20,6 @@ import java.io.File import java.util.concurrent.Future import java.util.concurrent.TimeUnit import kotlin.reflect.KClass -import kotlin.script.dependencies.DependenciesResolver.ResolveResult -import kotlin.script.dependencies.ScriptDependencies -import kotlin.script.dependencies.ScriptReport const val DEFAULT_SCRIPT_FILE_PATTERN = ".*\\.kts" diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt index 4473bbfec91..598016e03e7 100644 --- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt +++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptTemplateProviderExtensionPoint.kt @@ -22,7 +22,7 @@ import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.project.Project import java.io.File import java.net.URLClassLoader -import kotlin.script.dependencies.DependenciesResolver +import kotlin.script.experimental.dependencies.DependenciesResolver interface ScriptTemplatesProvider { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt index 9c2d44b8259..d40ddadd32a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.name.NameUtils import org.jetbrains.kotlin.parsing.KotlinParserDefinition import org.jetbrains.kotlin.psi.KtScript import kotlin.reflect.KClass -import kotlin.script.dependencies.DependenciesResolver +import kotlin.script.experimental.dependencies.DependenciesResolver import kotlin.script.templates.standard.ScriptTemplateWithArgs open class KotlinScriptDefinition(val template: KClass) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/ScriptDependenciesProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/ScriptDependenciesProvider.kt index dbabae2954a..61449d34b7b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/script/ScriptDependenciesProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/ScriptDependenciesProvider.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiFile -import kotlin.script.dependencies.ScriptDependencies +import kotlin.script.experimental.dependencies.ScriptDependencies interface ScriptDependenciesProvider { fun getScriptDependencies(file: VirtualFile): ScriptDependencies? diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java index 2af9411a6a8..9a65b152504 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java @@ -26,7 +26,7 @@ import com.intellij.testFramework.TestDataFile; import kotlin.collections.ArraysKt; import kotlin.collections.CollectionsKt; import kotlin.io.FilesKt; -import kotlin.script.dependencies.ScriptDependencies; +import kotlin.script.experimental.dependencies.ScriptDependencies; import kotlin.text.Charsets; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt index eb34fc99cb5..e8782136f4d 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt @@ -38,7 +38,8 @@ import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit import kotlin.concurrent.thread import kotlin.script.dependencies.* -import kotlin.script.dependencies.DependenciesResolver.ResolveResult +import kotlin.script.experimental.dependencies.* +import kotlin.script.experimental.dependencies.DependenciesResolver.ResolveResult import kotlin.script.templates.ScriptTemplateDefinition import kotlin.test.fail diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt index 270d538c6c2..f7fadd386f3 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt @@ -48,8 +48,9 @@ import java.net.URLClassLoader import java.util.concurrent.Future import kotlin.reflect.KClass import kotlin.script.dependencies.* -import kotlin.script.dependencies.DependenciesResolver.ResolveResult -import kotlin.script.dependencies.experimental.AsyncDependenciesResolver +import kotlin.script.experimental.dependencies.* +import kotlin.script.experimental.dependencies.DependenciesResolver.ResolveResult +import kotlin.script.experimental.dependencies.AsyncDependenciesResolver import kotlin.script.templates.AcceptedAnnotations import kotlin.script.templates.ScriptTemplateDefinition import kotlin.script.templates.standard.ScriptTemplateWithArgs diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt index 352973daf5a..3b4762568a8 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ScriptModuleInfos.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.script.KotlinScriptDefinition -import kotlin.script.dependencies.ScriptDependencies +import kotlin.script.experimental.dependencies.ScriptDependencies class ScriptModuleSearchScope(val scriptFile: VirtualFile, baseScope: GlobalSearchScope) : DelegatingGlobalSearchScope(baseScope) { override fun equals(other: Any?) = other is ScriptModuleSearchScope && scriptFile == other.scriptFile && super.equals(other) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ScriptExternalHighlightingPass.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ScriptExternalHighlightingPass.kt index 053bbb38b0a..042444165d9 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ScriptExternalHighlightingPass.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/ScriptExternalHighlightingPass.kt @@ -34,7 +34,7 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiFile import org.jetbrains.kotlin.idea.core.script.IdeScriptReportSink import org.jetbrains.kotlin.psi.KtFile -import kotlin.script.dependencies.ScriptReport +import kotlin.script.experimental.dependencies.ScriptReport class ScriptExternalHighlightingPass( private val file: KtFile, diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/IdeScriptReportSink.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/IdeScriptReportSink.kt index 0596b705d01..b0d27a794bd 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/IdeScriptReportSink.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/IdeScriptReportSink.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.core.script import com.intellij.openapi.util.Key import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.script.ScriptReportSink -import kotlin.script.dependencies.ScriptReport +import kotlin.script.experimental.dependencies.ScriptReport class IdeScriptReportSink : ScriptReportSink { override fun attachReports(scriptFile: VirtualFile, reports: List) { diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesCache.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesCache.kt index c13b4762276..af2c255717c 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesCache.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesCache.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.core.util.EDT import java.util.concurrent.locks.ReentrantReadWriteLock import kotlin.concurrent.read import kotlin.concurrent.write -import kotlin.script.dependencies.ScriptDependencies +import kotlin.script.experimental.dependencies.ScriptDependencies internal class ScriptDependenciesCache(private val project: Project) { private val cacheLock = ReentrantReadWriteLock() diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesFileAttribute.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesFileAttribute.kt index da58b20d6f2..6662cf8db93 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesFileAttribute.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesFileAttribute.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.idea.caches.FileAttributeService import java.io.DataInput import java.io.DataOutput import java.io.File -import kotlin.script.dependencies.ScriptDependencies +import kotlin.script.experimental.dependencies.ScriptDependencies object ScriptDependenciesFileAttribute { private val VERSION = 1 diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt index ed357618014..1424accd086 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider import org.jetbrains.kotlin.script.ScriptDependenciesProvider import org.jetbrains.kotlin.script.makeScriptDefsFromTemplatesProviderExtensions import java.io.File -import kotlin.script.dependencies.ScriptDependencies +import kotlin.script.experimental.dependencies.ScriptDependencies // NOTE: this service exists exclusively because ScriptDependencyManager diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt index f1184efd68a..837e118f196 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt @@ -36,9 +36,9 @@ import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.script.* import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.Executors -import kotlin.script.dependencies.DependenciesResolver -import kotlin.script.dependencies.ScriptDependencies -import kotlin.script.dependencies.experimental.AsyncDependenciesResolver +import kotlin.script.experimental.dependencies.DependenciesResolver +import kotlin.script.experimental.dependencies.ScriptDependencies +import kotlin.script.experimental.dependencies.AsyncDependenciesResolver internal class ScriptDependenciesUpdater( private val project: Project, diff --git a/idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt b/idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt index 12c3fe6dfd6..7e262935bbe 100644 --- a/idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/script/StandardKotlinScriptTemplateProvider.kt @@ -25,7 +25,8 @@ import org.jetbrains.kotlin.script.ScriptTemplatesProvider import org.jetbrains.kotlin.utils.PathUtil import java.io.File import kotlin.script.dependencies.* -import kotlin.script.dependencies.DependenciesResolver.ResolveResult +import kotlin.script.experimental.dependencies.* +import kotlin.script.experimental.dependencies.DependenciesResolver.ResolveResult import kotlin.script.templates.standard.ScriptTemplateWithArgs class StandardKotlinScriptTemplateProvider(val project: Project) : ScriptTemplatesProvider {