azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

script.runtime 1.1.4: Undeprecate old API

Browse Source
This commit is contained in:
Pavel V. Talanov
2017-07-28 19:46:52 +03:00
parent 9e34437447
commit d59a72ea75
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/script.runtime/src/kotlin/script/dependencies/dependencies_deprecated.kt
-1
View File
@@ -20,7 +20,6 @@ package kotlin.script.dependencies
import java.io.File import java.io.File
@Deprecated("Deprecated API. Use ScriptDependencies class.")
interface KotlinScriptExternalDependencies : Comparable<KotlinScriptExternalDependencies> { interface KotlinScriptExternalDependencies : Comparable<KotlinScriptExternalDependencies> {
val javaHome: String? get() = null val javaHome: String? get() = null
val classpath: Iterable<File> get() = emptyList() val classpath: Iterable<File> get() = emptyList()
core/script.runtime/src/kotlin/script/dependencies/resolvers.kt
+1 -2
View File
@@ -23,7 +23,7 @@ import kotlin.script.dependencies.DependenciesResolver.ResolveResult
typealias Environment = Map<String, Any?> typealias Environment = Map<String, Any?>
interface DependenciesResolver : @Suppress("DEPRECATION") ScriptDependenciesResolver { interface DependenciesResolver : ScriptDependenciesResolver {
fun resolve(scriptContents: ScriptContents, environment: Environment): ResolveResult fun resolve(scriptContents: ScriptContents, environment: Environment): ResolveResult
object NoDependencies : DependenciesResolver { object NoDependencies : DependenciesResolver {
@@ -52,7 +52,6 @@ interface ScriptContents {
val annotations: Iterable<Annotation> val annotations: Iterable<Annotation>
val text: CharSequence? val text: CharSequence?
@Deprecated("Use DependenciesResolver interface")
data class Position(val line: Int, val col: Int) data class Position(val line: Int, val col: Int)
} }
core/script.runtime/src/kotlin/script/dependencies/resolvers_deprecated.kt
-4
View File
@@ -21,7 +21,6 @@ package kotlin.script.dependencies
import java.util.concurrent.Future import java.util.concurrent.Future
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@Deprecated("Use DependenciesResolver interface")
interface ScriptDependenciesResolver { interface ScriptDependenciesResolver {
enum class ReportSeverity { ERROR, WARNING, INFO, DEBUG } enum class ReportSeverity { ERROR, WARNING, INFO, DEBUG }
@@ -33,13 +32,10 @@ interface ScriptDependenciesResolver {
): Future<KotlinScriptExternalDependencies?> = PseudoFuture(null) ): Future<KotlinScriptExternalDependencies?> = PseudoFuture(null)
} }
@Deprecated("Use DependenciesResolver interface")
class BasicScriptDependenciesResolver : ScriptDependenciesResolver class BasicScriptDependenciesResolver : ScriptDependenciesResolver
@Deprecated("Use DependenciesResolver interface")
fun KotlinScriptExternalDependencies?.asFuture(): PseudoFuture<KotlinScriptExternalDependencies?> = PseudoFuture(this) fun KotlinScriptExternalDependencies?.asFuture(): PseudoFuture<KotlinScriptExternalDependencies?> = PseudoFuture(this)
@Deprecated("Use DependenciesResolver interface")
class PseudoFuture<T>(private val value: T): Future<T> { class PseudoFuture<T>(private val value: T): Future<T> {
override fun get(): T = value override fun get(): T = value
override fun get(p0: Long, p1: TimeUnit): T = value override fun get(p0: Long, p1: TimeUnit): T = value