From a57321dea85096c46bfc5076a2fcc68a3a0ddc33 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 12 Oct 2016 04:24:37 +0300 Subject: [PATCH] Annotate all new API with SinceKotlin in kotlin-stdlib and kotlin-test --- .../shared/src/main/kotlin/kotlin/test/TestAssertions.kt | 1 + libraries/stdlib/src/kotlin/collections/AbstractCollection.kt | 1 + libraries/stdlib/src/kotlin/collections/AbstractList.kt | 1 + libraries/stdlib/src/kotlin/collections/AbstractMap.kt | 1 + .../stdlib/src/kotlin/collections/AbstractMutableCollection.kt | 1 + libraries/stdlib/src/kotlin/collections/AbstractMutableList.kt | 1 + libraries/stdlib/src/kotlin/collections/AbstractMutableMap.kt | 1 + libraries/stdlib/src/kotlin/collections/AbstractMutableSet.kt | 1 + libraries/stdlib/src/kotlin/collections/AbstractSet.kt | 1 + libraries/stdlib/src/kotlin/collections/Maps.kt | 3 +++ .../stdlib/src/kotlin/internal/PlatformImplementations.kt | 1 + libraries/stdlib/src/kotlin/text/StringBuilder.kt | 1 + libraries/stdlib/src/kotlin/text/regex/MatchResult.kt | 1 + 13 files changed, 15 insertions(+) diff --git a/libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/TestAssertions.kt b/libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/TestAssertions.kt index bb714d706d7..56aa678f42b 100644 --- a/libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/TestAssertions.kt +++ b/libraries/kotlin.test/shared/src/main/kotlin/kotlin/test/TestAssertions.kt @@ -88,6 +88,7 @@ fun <@OnlyInputTypes T> expect(expected: T, message: String?, block: () -> T) { fun assertFails(block: () -> Unit): Throwable = assertFails(null, block) /** Asserts that given function [block] fails by throwing an exception. */ +@SinceKotlin("1.1") fun assertFails(message: String?, block: () -> Unit): Throwable { try { block() diff --git a/libraries/stdlib/src/kotlin/collections/AbstractCollection.kt b/libraries/stdlib/src/kotlin/collections/AbstractCollection.kt index 4175a7f517a..3036c71763b 100644 --- a/libraries/stdlib/src/kotlin/collections/AbstractCollection.kt +++ b/libraries/stdlib/src/kotlin/collections/AbstractCollection.kt @@ -15,6 +15,7 @@ */ package kotlin.collections +@SinceKotlin("1.1") public abstract class AbstractCollection protected constructor() : Collection { abstract override val size: Int abstract override fun iterator(): Iterator diff --git a/libraries/stdlib/src/kotlin/collections/AbstractList.kt b/libraries/stdlib/src/kotlin/collections/AbstractList.kt index e0bc4fde29b..134f31043b1 100644 --- a/libraries/stdlib/src/kotlin/collections/AbstractList.kt +++ b/libraries/stdlib/src/kotlin/collections/AbstractList.kt @@ -20,6 +20,7 @@ package kotlin.collections +@SinceKotlin("1.1") public abstract class AbstractList protected constructor() : AbstractCollection(), List { abstract override val size: Int abstract override fun get(index: Int): E diff --git a/libraries/stdlib/src/kotlin/collections/AbstractMap.kt b/libraries/stdlib/src/kotlin/collections/AbstractMap.kt index a1297d4e790..0d0d8d4d312 100644 --- a/libraries/stdlib/src/kotlin/collections/AbstractMap.kt +++ b/libraries/stdlib/src/kotlin/collections/AbstractMap.kt @@ -20,6 +20,7 @@ package kotlin.collections +@SinceKotlin("1.1") public abstract class AbstractMap protected constructor() : Map { override fun containsKey(key: K): Boolean { diff --git a/libraries/stdlib/src/kotlin/collections/AbstractMutableCollection.kt b/libraries/stdlib/src/kotlin/collections/AbstractMutableCollection.kt index 3a254603c3b..9bbbba5cda4 100644 --- a/libraries/stdlib/src/kotlin/collections/AbstractMutableCollection.kt +++ b/libraries/stdlib/src/kotlin/collections/AbstractMutableCollection.kt @@ -3,6 +3,7 @@ package kotlin.collections import java.util.AbstractCollection +@SinceKotlin("1.1") public abstract class AbstractMutableCollection protected constructor() : AbstractCollection() { abstract override fun add(element: E): Boolean } \ No newline at end of file diff --git a/libraries/stdlib/src/kotlin/collections/AbstractMutableList.kt b/libraries/stdlib/src/kotlin/collections/AbstractMutableList.kt index 95fd960d282..370e95d2e55 100644 --- a/libraries/stdlib/src/kotlin/collections/AbstractMutableList.kt +++ b/libraries/stdlib/src/kotlin/collections/AbstractMutableList.kt @@ -3,6 +3,7 @@ package kotlin.collections import java.util.AbstractList +@SinceKotlin("1.1") public abstract class AbstractMutableList protected constructor() : AbstractList() { abstract override fun set(index: Int, element: E): E abstract override fun removeAt(index: Int): E diff --git a/libraries/stdlib/src/kotlin/collections/AbstractMutableMap.kt b/libraries/stdlib/src/kotlin/collections/AbstractMutableMap.kt index fec910b1660..e88c3a745b2 100644 --- a/libraries/stdlib/src/kotlin/collections/AbstractMutableMap.kt +++ b/libraries/stdlib/src/kotlin/collections/AbstractMutableMap.kt @@ -3,6 +3,7 @@ package kotlin.collections import java.util.AbstractMap +@SinceKotlin("1.1") public abstract class AbstractMutableMap protected constructor() : AbstractMap() { abstract override fun put(key: K, value: V): V? } \ No newline at end of file diff --git a/libraries/stdlib/src/kotlin/collections/AbstractMutableSet.kt b/libraries/stdlib/src/kotlin/collections/AbstractMutableSet.kt index 532e5e21787..5d34c9acd89 100644 --- a/libraries/stdlib/src/kotlin/collections/AbstractMutableSet.kt +++ b/libraries/stdlib/src/kotlin/collections/AbstractMutableSet.kt @@ -3,6 +3,7 @@ package kotlin.collections import java.util.AbstractSet +@SinceKotlin("1.1") public abstract class AbstractMutableSet protected constructor() : AbstractSet() { // nothing to make abstract, maybe leave it typealias then? } \ No newline at end of file diff --git a/libraries/stdlib/src/kotlin/collections/AbstractSet.kt b/libraries/stdlib/src/kotlin/collections/AbstractSet.kt index deec185ed56..1482a301cf1 100644 --- a/libraries/stdlib/src/kotlin/collections/AbstractSet.kt +++ b/libraries/stdlib/src/kotlin/collections/AbstractSet.kt @@ -15,6 +15,7 @@ */ package kotlin.collections +@SinceKotlin("1.1") public abstract class AbstractSet protected constructor() : AbstractCollection(), Set { override fun equals(other: Any?): Boolean { diff --git a/libraries/stdlib/src/kotlin/collections/Maps.kt b/libraries/stdlib/src/kotlin/collections/Maps.kt index cd8cd063658..00d4f1a1b3c 100644 --- a/libraries/stdlib/src/kotlin/collections/Maps.kt +++ b/libraries/stdlib/src/kotlin/collections/Maps.kt @@ -445,6 +445,7 @@ public fun > Sequence>.toMap(destina * * The returned map preserves the entry iteration order of the original map. */ +@SinceKotlin("1.1") public fun Map.toMap(): Map = when (size) { 0 -> emptyMap() 1 -> toSingletonMap() @@ -456,11 +457,13 @@ public fun Map.toMap(): Map = when (size) { * * The returned map preserves the entry iteration order of the original map. */ +@SinceKotlin("1.1") public fun Map.toMutableMap(): MutableMap = LinkedHashMap(this) /** * Populates and returns the [destination] mutable map with key-value pairs from the given map. */ +@SinceKotlin("1.1") public fun > Map.toMap(destination: M): M = destination.apply { putAll(this@toMap) } diff --git a/libraries/stdlib/src/kotlin/internal/PlatformImplementations.kt b/libraries/stdlib/src/kotlin/internal/PlatformImplementations.kt index adbfb6faf34..8b72940396e 100644 --- a/libraries/stdlib/src/kotlin/internal/PlatformImplementations.kt +++ b/libraries/stdlib/src/kotlin/internal/PlatformImplementations.kt @@ -22,6 +22,7 @@ internal open class PlatformImplementations { } } +@SinceKotlin("1.1") @kotlin.internal.InlineExposed internal fun platformCloseSuppressed(instance: Closeable, cause: Throwable) = IMPLEMENTATIONS.closeSuppressed(instance, cause) diff --git a/libraries/stdlib/src/kotlin/text/StringBuilder.kt b/libraries/stdlib/src/kotlin/text/StringBuilder.kt index 4dcaa149a7c..a3bbd6a9d73 100644 --- a/libraries/stdlib/src/kotlin/text/StringBuilder.kt +++ b/libraries/stdlib/src/kotlin/text/StringBuilder.kt @@ -15,6 +15,7 @@ public inline fun buildString(builderAction: StringBuilder.() -> Unit): String = * Builds new string by populating newly created [StringBuilder] initialized with the given [capacity] * using provided [builderAction] and then converting it to [String]. */ +@SinceKotlin("1.1") @kotlin.internal.InlineOnly public inline fun buildString(capacity: Int, builderAction: StringBuilder.() -> Unit): String = StringBuilder(capacity).apply(builderAction).toString() diff --git a/libraries/stdlib/src/kotlin/text/regex/MatchResult.kt b/libraries/stdlib/src/kotlin/text/regex/MatchResult.kt index e406ce36537..9c0876f9ea2 100644 --- a/libraries/stdlib/src/kotlin/text/regex/MatchResult.kt +++ b/libraries/stdlib/src/kotlin/text/regex/MatchResult.kt @@ -41,6 +41,7 @@ public interface MatchGroupCollection : Collection { /** * Extends [MatchGroupCollection] by introducing a way to get matched groups by name, when regex supports it. */ +@SinceKotlin("1.1") public interface MatchNamedGroupCollection : MatchGroupCollection { /** * Returns a named group with the specified [name].