diff --git a/core/script.runtime/src/kotlin/script/dependencies/dependencies_deprecated.kt b/core/script.runtime/src/kotlin/script/dependencies/dependencies_deprecated.kt index a5f063e8c60..350b9d5a5ef 100644 --- a/core/script.runtime/src/kotlin/script/dependencies/dependencies_deprecated.kt +++ b/core/script.runtime/src/kotlin/script/dependencies/dependencies_deprecated.kt @@ -20,7 +20,6 @@ package kotlin.script.dependencies import java.io.File -@Deprecated("Deprecated API. Use ScriptDependencies class.") interface KotlinScriptExternalDependencies : Comparable { val javaHome: String? get() = null val classpath: Iterable get() = emptyList() diff --git a/core/script.runtime/src/kotlin/script/dependencies/resolvers.kt b/core/script.runtime/src/kotlin/script/dependencies/resolvers.kt index ff102997c9f..0187f06df27 100644 --- a/core/script.runtime/src/kotlin/script/dependencies/resolvers.kt +++ b/core/script.runtime/src/kotlin/script/dependencies/resolvers.kt @@ -23,7 +23,7 @@ import kotlin.script.dependencies.DependenciesResolver.ResolveResult typealias Environment = Map -interface DependenciesResolver : @Suppress("DEPRECATION") ScriptDependenciesResolver { +interface DependenciesResolver : ScriptDependenciesResolver { fun resolve(scriptContents: ScriptContents, environment: Environment): ResolveResult object NoDependencies : DependenciesResolver { @@ -52,7 +52,6 @@ interface ScriptContents { val annotations: Iterable val text: CharSequence? - @Deprecated("Use DependenciesResolver interface") data class Position(val line: Int, val col: Int) } diff --git a/core/script.runtime/src/kotlin/script/dependencies/resolvers_deprecated.kt b/core/script.runtime/src/kotlin/script/dependencies/resolvers_deprecated.kt index 78fc5e14936..27f5bf92ecd 100644 --- a/core/script.runtime/src/kotlin/script/dependencies/resolvers_deprecated.kt +++ b/core/script.runtime/src/kotlin/script/dependencies/resolvers_deprecated.kt @@ -21,7 +21,6 @@ package kotlin.script.dependencies import java.util.concurrent.Future import java.util.concurrent.TimeUnit -@Deprecated("Use DependenciesResolver interface") interface ScriptDependenciesResolver { enum class ReportSeverity { ERROR, WARNING, INFO, DEBUG } @@ -33,13 +32,10 @@ interface ScriptDependenciesResolver { ): Future = PseudoFuture(null) } -@Deprecated("Use DependenciesResolver interface") class BasicScriptDependenciesResolver : ScriptDependenciesResolver -@Deprecated("Use DependenciesResolver interface") fun KotlinScriptExternalDependencies?.asFuture(): PseudoFuture = PseudoFuture(this) -@Deprecated("Use DependenciesResolver interface") class PseudoFuture(private val value: T): Future { override fun get(): T = value override fun get(p0: Long, p1: TimeUnit): T = value