From 059ffe7a9ba5add0a6a705a87564f0e7695113a2 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 24 Jun 2022 07:36:01 +0300 Subject: [PATCH] Cleanup obsolete RequireKotlin annotations They were used to prevent older compiler versions from using specific API, but now these versions are even older than the first compiler version (namely 1.6) that can read this stdlib. --- libraries/stdlib/jvm/src/kotlin/io/Closeable.kt | 1 - libraries/stdlib/jvm/src/kotlin/io/FileReadWrite.kt | 1 - libraries/stdlib/jvm/src/kotlin/io/ReadWrite.kt | 1 - libraries/stdlib/jvm/src/kotlin/jvm/JvmDefault.kt | 2 -- libraries/stdlib/src/kotlin/annotations/Experimental.kt | 2 -- libraries/stdlib/src/kotlin/annotations/Multiplatform.kt | 2 -- libraries/stdlib/src/kotlin/annotations/OptIn.kt | 2 -- libraries/stdlib/src/kotlin/util/Suspend.kt | 1 - libraries/stdlib/unsigned/src/kotlin/annotations/Unsigned.kt | 1 - 9 files changed, 13 deletions(-) diff --git a/libraries/stdlib/jvm/src/kotlin/io/Closeable.kt b/libraries/stdlib/jvm/src/kotlin/io/Closeable.kt index e41fe2637aa..09ecff996e5 100644 --- a/libraries/stdlib/jvm/src/kotlin/io/Closeable.kt +++ b/libraries/stdlib/jvm/src/kotlin/io/Closeable.kt @@ -18,7 +18,6 @@ import kotlin.internal.* * @return the result of [block] function invoked on this resource. */ @InlineOnly -@RequireKotlin("1.2", versionKind = RequireKotlinVersionKind.COMPILER_VERSION, message = "Requires newer compiler version to be inlined correctly.") public inline fun T.use(block: (T) -> R): R { contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) diff --git a/libraries/stdlib/jvm/src/kotlin/io/FileReadWrite.kt b/libraries/stdlib/jvm/src/kotlin/io/FileReadWrite.kt index 0d64b9d2cbb..94f583b552d 100644 --- a/libraries/stdlib/jvm/src/kotlin/io/FileReadWrite.kt +++ b/libraries/stdlib/jvm/src/kotlin/io/FileReadWrite.kt @@ -227,6 +227,5 @@ public fun File.readLines(charset: Charset = Charsets.UTF_8): List { * @param charset character set to use. By default uses UTF-8 charset. * @return the value returned by [block]. */ -@RequireKotlin("1.2", versionKind = RequireKotlinVersionKind.COMPILER_VERSION, message = "Requires newer compiler version to be inlined correctly.") public inline fun File.useLines(charset: Charset = Charsets.UTF_8, block: (Sequence) -> T): T = bufferedReader(charset).use { block(it.lineSequence()) } diff --git a/libraries/stdlib/jvm/src/kotlin/io/ReadWrite.kt b/libraries/stdlib/jvm/src/kotlin/io/ReadWrite.kt index 2f74c03dffc..08f199b7af6 100644 --- a/libraries/stdlib/jvm/src/kotlin/io/ReadWrite.kt +++ b/libraries/stdlib/jvm/src/kotlin/io/ReadWrite.kt @@ -48,7 +48,6 @@ public fun Reader.readLines(): List { * the processing is complete. * @return the value returned by [block]. */ -@RequireKotlin("1.2", versionKind = RequireKotlinVersionKind.COMPILER_VERSION, message = "Requires newer compiler version to be inlined correctly.") public inline fun Reader.useLines(block: (Sequence) -> T): T = buffered().use { block(it.lineSequence()) } diff --git a/libraries/stdlib/jvm/src/kotlin/jvm/JvmDefault.kt b/libraries/stdlib/jvm/src/kotlin/jvm/JvmDefault.kt index 217c1169af7..518651d589d 100644 --- a/libraries/stdlib/jvm/src/kotlin/jvm/JvmDefault.kt +++ b/libraries/stdlib/jvm/src/kotlin/jvm/JvmDefault.kt @@ -29,7 +29,6 @@ import kotlin.internal.RequireKotlinVersionKind * @[JvmDefault] methods are excluded from interface delegation. */ @SinceKotlin("1.2") -@RequireKotlin("1.2.40", versionKind = RequireKotlinVersionKind.COMPILER_VERSION) @Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY) @Deprecated("Switch to new -Xjvm-default modes: `all` or `all-compatibility`") annotation class JvmDefault @@ -45,7 +44,6 @@ annotation class JvmDefault * Used only with `-Xjvm-default=compatibility|all-compatibility`. */ @SinceKotlin("1.4") -@RequireKotlin("1.4", versionKind = RequireKotlinVersionKind.COMPILER_VERSION) @Target(AnnotationTarget.CLASS) annotation class JvmDefaultWithoutCompatibility diff --git a/libraries/stdlib/src/kotlin/annotations/Experimental.kt b/libraries/stdlib/src/kotlin/annotations/Experimental.kt index 579d172adaf..85ac10f276a 100644 --- a/libraries/stdlib/src/kotlin/annotations/Experimental.kt +++ b/libraries/stdlib/src/kotlin/annotations/Experimental.kt @@ -24,7 +24,6 @@ import kotlin.reflect.KClass @Target(ANNOTATION_CLASS) @Retention(BINARY) @SinceKotlin("1.2") -@RequireKotlin("1.2.50", versionKind = RequireKotlinVersionKind.COMPILER_VERSION) @DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") @Deprecated("Please use RequiresOptIn instead.") public annotation class Experimental(val level: Level = Level.ERROR) { @@ -51,7 +50,6 @@ public annotation class Experimental(val level: Level = Level.ERROR) { ) @Retention(SOURCE) @SinceKotlin("1.2") -@RequireKotlin("1.2.50", versionKind = RequireKotlinVersionKind.COMPILER_VERSION) @DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") @Deprecated("Please use OptIn instead.", ReplaceWith("OptIn(*markerClass)", "kotlin.OptIn")) public annotation class UseExperimental( diff --git a/libraries/stdlib/src/kotlin/annotations/Multiplatform.kt b/libraries/stdlib/src/kotlin/annotations/Multiplatform.kt index 50fa6662854..c89ec3a8e3b 100644 --- a/libraries/stdlib/src/kotlin/annotations/Multiplatform.kt +++ b/libraries/stdlib/src/kotlin/annotations/Multiplatform.kt @@ -32,7 +32,6 @@ import kotlin.internal.RequireKotlinVersionKind TYPEALIAS ) @Retention(AnnotationRetention.BINARY) -@RequireKotlin("1.2.50", versionKind = RequireKotlinVersionKind.COMPILER_VERSION) public annotation class ExperimentalMultiplatform /** @@ -48,5 +47,4 @@ public annotation class ExperimentalMultiplatform @Target(ANNOTATION_CLASS) @Retention(AnnotationRetention.BINARY) @ExperimentalMultiplatform -@RequireKotlin("1.2.50", versionKind = RequireKotlinVersionKind.COMPILER_VERSION) public annotation class OptionalExpectation diff --git a/libraries/stdlib/src/kotlin/annotations/OptIn.kt b/libraries/stdlib/src/kotlin/annotations/OptIn.kt index eef93f0decb..d0fe1f2e3ef 100644 --- a/libraries/stdlib/src/kotlin/annotations/OptIn.kt +++ b/libraries/stdlib/src/kotlin/annotations/OptIn.kt @@ -26,7 +26,6 @@ import kotlin.reflect.KClass @Target(ANNOTATION_CLASS) @Retention(BINARY) @SinceKotlin("1.3") -@RequireKotlin("1.3.70", versionKind = RequireKotlinVersionKind.COMPILER_VERSION) public annotation class RequiresOptIn( val message: String = "", val level: Level = Level.ERROR @@ -53,7 +52,6 @@ public annotation class RequiresOptIn( ) @Retention(SOURCE) @SinceKotlin("1.3") -@RequireKotlin("1.3.70", versionKind = RequireKotlinVersionKind.COMPILER_VERSION) public annotation class OptIn( vararg val markerClass: KClass ) diff --git a/libraries/stdlib/src/kotlin/util/Suspend.kt b/libraries/stdlib/src/kotlin/util/Suspend.kt index a3fb816e280..857b381029f 100644 --- a/libraries/stdlib/src/kotlin/util/Suspend.kt +++ b/libraries/stdlib/src/kotlin/util/Suspend.kt @@ -10,5 +10,4 @@ import kotlin.internal.RequireKotlinVersionKind @kotlin.internal.InlineOnly @SinceKotlin("1.2") @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@RequireKotlin("1.2.30", level = DeprecationLevel.HIDDEN, versionKind = RequireKotlinVersionKind.COMPILER_VERSION) public inline fun suspend(noinline block: suspend () -> R): suspend () -> R = block diff --git a/libraries/stdlib/unsigned/src/kotlin/annotations/Unsigned.kt b/libraries/stdlib/unsigned/src/kotlin/annotations/Unsigned.kt index d9a667d6509..81a4ad3ebb0 100644 --- a/libraries/stdlib/unsigned/src/kotlin/annotations/Unsigned.kt +++ b/libraries/stdlib/unsigned/src/kotlin/annotations/Unsigned.kt @@ -23,5 +23,4 @@ import kotlin.internal.RequireKotlinVersionKind @MustBeDocumented @Target(CLASS, ANNOTATION_CLASS, PROPERTY, FIELD, LOCAL_VARIABLE, VALUE_PARAMETER, CONSTRUCTOR, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, TYPEALIAS) @Retention(AnnotationRetention.BINARY) -@RequireKotlin("1.2.50", versionKind = RequireKotlinVersionKind.COMPILER_VERSION) public annotation class ExperimentalUnsignedTypes