script.runtime 1.1.4: Undeprecate old API
This commit is contained in:
@@ -20,7 +20,6 @@ package kotlin.script.dependencies
|
||||
|
||||
import java.io.File
|
||||
|
||||
@Deprecated("Deprecated API. Use ScriptDependencies class.")
|
||||
interface KotlinScriptExternalDependencies : Comparable<KotlinScriptExternalDependencies> {
|
||||
val javaHome: String? get() = null
|
||||
val classpath: Iterable<File> get() = emptyList()
|
||||
|
||||
@@ -23,7 +23,7 @@ import kotlin.script.dependencies.DependenciesResolver.ResolveResult
|
||||
|
||||
typealias Environment = Map<String, Any?>
|
||||
|
||||
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<Annotation>
|
||||
val text: CharSequence?
|
||||
|
||||
@Deprecated("Use DependenciesResolver interface")
|
||||
data class Position(val line: Int, val col: Int)
|
||||
}
|
||||
|
||||
|
||||
@@ -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<KotlinScriptExternalDependencies?> = PseudoFuture(null)
|
||||
}
|
||||
|
||||
@Deprecated("Use DependenciesResolver interface")
|
||||
class BasicScriptDependenciesResolver : ScriptDependenciesResolver
|
||||
|
||||
@Deprecated("Use DependenciesResolver interface")
|
||||
fun KotlinScriptExternalDependencies?.asFuture(): PseudoFuture<KotlinScriptExternalDependencies?> = PseudoFuture(this)
|
||||
|
||||
@Deprecated("Use DependenciesResolver interface")
|
||||
class PseudoFuture<T>(private val value: T): Future<T> {
|
||||
override fun get(): T = value
|
||||
override fun get(p0: Long, p1: TimeUnit): T = value
|
||||
|
||||
Reference in New Issue
Block a user