From c0c01d6e49efbf8641c08de3048b01ac8bcc7fca Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 31 Jan 2017 22:41:47 +0300 Subject: [PATCH] Drop HIDDEN deprecations from kotlin-stdlib. --- libraries/stdlib/jre7/src/kotlin/Standard.kt | 10 ---------- .../src/kotlin/internal/PlatformImplementations.kt | 6 ------ .../kotlin-stdlib-runtime-merged.txt | 4 ---- .../reference-public-api/kotlin-stdlib.txt | 4 ---- 4 files changed, 24 deletions(-) delete mode 100644 libraries/stdlib/jre7/src/kotlin/Standard.kt diff --git a/libraries/stdlib/jre7/src/kotlin/Standard.kt b/libraries/stdlib/jre7/src/kotlin/Standard.kt deleted file mode 100644 index ffb74a5e697..00000000000 --- a/libraries/stdlib/jre7/src/kotlin/Standard.kt +++ /dev/null @@ -1,10 +0,0 @@ -@file:JvmName("StandardJRE7Kt") -package kotlin - -// TODO: Drop before 1.1 -@SinceKotlin("1.1") -@PublishedApi -@Deprecated("Provided for binary compatibility") -@JvmName("closeSuppressed") -internal fun AutoCloseable.closeSuppressedDeprecated(cause: Throwable) = closeFinally(cause) - diff --git a/libraries/stdlib/src/kotlin/internal/PlatformImplementations.kt b/libraries/stdlib/src/kotlin/internal/PlatformImplementations.kt index 7819d8b1cb6..0c42bbe5409 100644 --- a/libraries/stdlib/src/kotlin/internal/PlatformImplementations.kt +++ b/libraries/stdlib/src/kotlin/internal/PlatformImplementations.kt @@ -15,12 +15,6 @@ internal open class PlatformImplementations { } } -// TODO: drop before 1.1 -@SinceKotlin("1.1") -@PublishedApi -@Deprecated("Provided for binary compatibility", level = DeprecationLevel.HIDDEN) -internal fun platformCloseSuppressed(instance: Closeable, cause: Throwable) = instance.closeFinally(cause) - @JvmField internal val IMPLEMENTATIONS: PlatformImplementations = run { diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt index c8190636fe9..f85204dd2b1 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt @@ -2044,10 +2044,6 @@ public final class kotlin/coroutines/experimental/jvm/internal/CoroutineIntrinsi public static final fun normalizeContinuation (Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation; } -public final class kotlin/internal/PlatformImplementationsKt { - public static final synthetic fun platformCloseSuppressed (Ljava/io/Closeable;Ljava/lang/Throwable;)V -} - public final class kotlin/io/AccessDeniedException : kotlin/io/FileSystemException { public fun (Ljava/io/File;Ljava/io/File;Ljava/lang/String;)V public synthetic fun (Ljava/io/File;Ljava/io/File;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt index 5ab95168b53..c1fb7ca964b 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt @@ -1863,10 +1863,6 @@ public final class kotlin/coroutines/experimental/jvm/internal/CoroutineIntrinsi public static final fun normalizeContinuation (Lkotlin/coroutines/experimental/Continuation;)Lkotlin/coroutines/experimental/Continuation; } -public final class kotlin/internal/PlatformImplementationsKt { - public static final synthetic fun platformCloseSuppressed (Ljava/io/Closeable;Ljava/lang/Throwable;)V -} - public final class kotlin/io/AccessDeniedException : kotlin/io/FileSystemException { public fun (Ljava/io/File;Ljava/io/File;Ljava/lang/String;)V public synthetic fun (Ljava/io/File;Ljava/io/File;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V