From 9a004ceda2705f0643c990733e9ecb8cb1775d14 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Sun, 30 Jul 2017 17:16:40 +0300 Subject: [PATCH] script.runtime 1.1.4: Remove copy of ScriptContents class This class is not new(experimental) API is not supposed to be moved --- .../dependencies/AsyncDependenciesResolver.kt | 1 + .../script/experimental/dependencies/resolvers.kt | 10 +--------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/core/script.runtime/src/kotlin/script/experimental/dependencies/AsyncDependenciesResolver.kt b/core/script.runtime/src/kotlin/script/experimental/dependencies/AsyncDependenciesResolver.kt index 65cd203508f..1d6ba3d68ee 100644 --- a/core/script.runtime/src/kotlin/script/experimental/dependencies/AsyncDependenciesResolver.kt +++ b/core/script.runtime/src/kotlin/script/experimental/dependencies/AsyncDependenciesResolver.kt @@ -19,6 +19,7 @@ package kotlin.script.experimental.dependencies import kotlin.script.dependencies.Environment +import kotlin.script.dependencies.ScriptContents interface AsyncDependenciesResolver : DependenciesResolver { suspend fun resolveAsync( diff --git a/core/script.runtime/src/kotlin/script/experimental/dependencies/resolvers.kt b/core/script.runtime/src/kotlin/script/experimental/dependencies/resolvers.kt index 120e10676c3..f9c3673e8d1 100644 --- a/core/script.runtime/src/kotlin/script/experimental/dependencies/resolvers.kt +++ b/core/script.runtime/src/kotlin/script/experimental/dependencies/resolvers.kt @@ -18,8 +18,8 @@ package kotlin.script.experimental.dependencies -import java.io.File import kotlin.script.dependencies.Environment +import kotlin.script.dependencies.ScriptContents import kotlin.script.dependencies.ScriptDependenciesResolver import kotlin.script.experimental.dependencies.DependenciesResolver.ResolveResult @@ -47,14 +47,6 @@ interface DependenciesResolver : ScriptDependenciesResolver { } } -interface ScriptContents { - val file: File? - val annotations: Iterable - val text: CharSequence? - - data class Position(val line: Int, val col: Int) -} - data class ScriptReport(val message: String, val severity: Severity = Severity.ERROR, val position: Position? = null) { data class Position(val startLine: Int, val startColumn: Int, val endLine: Int? = null, val endColumn: Int? = null) enum class Severity { ERROR, WARNING, INFO, DEBUG }