From 2966420d24403a8c09c775536cd3664d66062088 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 14 Dec 2015 22:52:48 +0300 Subject: [PATCH] Harden deprecation level for synchronized helper functions. Make migration helper classes deprecated-hidden, although it doesn't affect anything. --- libraries/stdlib/src/kotlin/ArraysKt.java | 2 +- libraries/stdlib/src/kotlin/CharsKt.java | 2 +- libraries/stdlib/src/kotlin/CollectionsKt.java | 2 +- libraries/stdlib/src/kotlin/MapsKt.java | 2 +- libraries/stdlib/src/kotlin/RangesKt.java | 2 +- libraries/stdlib/src/kotlin/SequencesKt.java | 2 +- libraries/stdlib/src/kotlin/SetsKt.java | 2 +- libraries/stdlib/src/kotlin/StringsKt.java | 2 +- libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt | 4 ++-- libraries/stdlib/src/kotlin/util/Synchronized.kt | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/stdlib/src/kotlin/ArraysKt.java b/libraries/stdlib/src/kotlin/ArraysKt.java index 9b19d48b13b..35032f6c1cf 100644 --- a/libraries/stdlib/src/kotlin/ArraysKt.java +++ b/libraries/stdlib/src/kotlin/ArraysKt.java @@ -1,7 +1,7 @@ package kotlin; @java.lang.Deprecated -@kotlin.Deprecated(message = "Use kotlin.collections.ArraysKt instead") +@kotlin.Deprecated(message = "Use kotlin.collections.ArraysKt instead", level = DeprecationLevel.HIDDEN) public class ArraysKt extends kotlin.collections.ArraysKt { } diff --git a/libraries/stdlib/src/kotlin/CharsKt.java b/libraries/stdlib/src/kotlin/CharsKt.java index 99bd5175be5..706decdae58 100644 --- a/libraries/stdlib/src/kotlin/CharsKt.java +++ b/libraries/stdlib/src/kotlin/CharsKt.java @@ -17,6 +17,6 @@ package kotlin; @java.lang.Deprecated -@Deprecated(message = "Use kotlin.text.CharsKt instead") +@Deprecated(message = "Use kotlin.text.CharsKt instead", level = DeprecationLevel.HIDDEN) public class CharsKt extends kotlin.text.CharsKt { } diff --git a/libraries/stdlib/src/kotlin/CollectionsKt.java b/libraries/stdlib/src/kotlin/CollectionsKt.java index 39c44232917..32459cbf019 100644 --- a/libraries/stdlib/src/kotlin/CollectionsKt.java +++ b/libraries/stdlib/src/kotlin/CollectionsKt.java @@ -1,6 +1,6 @@ package kotlin; @java.lang.Deprecated -@kotlin.Deprecated(message = "Use kotlin.collections.CollectionsKt instead") +@kotlin.Deprecated(message = "Use kotlin.collections.CollectionsKt instead", level = DeprecationLevel.HIDDEN) public class CollectionsKt extends kotlin.collections.CollectionsKt { } diff --git a/libraries/stdlib/src/kotlin/MapsKt.java b/libraries/stdlib/src/kotlin/MapsKt.java index 3f2d38c79ad..996d2324c4a 100644 --- a/libraries/stdlib/src/kotlin/MapsKt.java +++ b/libraries/stdlib/src/kotlin/MapsKt.java @@ -17,6 +17,6 @@ package kotlin; @java.lang.Deprecated -@Deprecated(message = "Use kotlin.collections.MapsKt instead") +@Deprecated(message = "Use kotlin.collections.MapsKt instead", level = DeprecationLevel.HIDDEN) public class MapsKt extends kotlin.collections.MapsKt { } diff --git a/libraries/stdlib/src/kotlin/RangesKt.java b/libraries/stdlib/src/kotlin/RangesKt.java index 3a2ebdb3757..2de2f6b01bf 100644 --- a/libraries/stdlib/src/kotlin/RangesKt.java +++ b/libraries/stdlib/src/kotlin/RangesKt.java @@ -17,6 +17,6 @@ package kotlin; @java.lang.Deprecated -@Deprecated(message = "Use kotlin.ranges.RangesKt instead") +@Deprecated(message = "Use kotlin.ranges.RangesKt instead", level = DeprecationLevel.HIDDEN) public class RangesKt extends kotlin.ranges.RangesKt { } diff --git a/libraries/stdlib/src/kotlin/SequencesKt.java b/libraries/stdlib/src/kotlin/SequencesKt.java index 52833d5bb5c..5c9a02d2c62 100644 --- a/libraries/stdlib/src/kotlin/SequencesKt.java +++ b/libraries/stdlib/src/kotlin/SequencesKt.java @@ -17,6 +17,6 @@ package kotlin; @java.lang.Deprecated -@Deprecated(message = "Use kotlin.sequences.SequencesKt instead") +@Deprecated(message = "Use kotlin.sequences.SequencesKt instead", level = DeprecationLevel.HIDDEN) public class SequencesKt extends kotlin.sequences.SequencesKt { } diff --git a/libraries/stdlib/src/kotlin/SetsKt.java b/libraries/stdlib/src/kotlin/SetsKt.java index 1c783d0097f..0f24e0312d9 100644 --- a/libraries/stdlib/src/kotlin/SetsKt.java +++ b/libraries/stdlib/src/kotlin/SetsKt.java @@ -17,6 +17,6 @@ package kotlin; @java.lang.Deprecated -@Deprecated(message = "Use kotlin.collections.SetsKt instead") +@Deprecated(message = "Use kotlin.collections.SetsKt instead", level = DeprecationLevel.HIDDEN) public class SetsKt extends kotlin.collections.SetsKt { } diff --git a/libraries/stdlib/src/kotlin/StringsKt.java b/libraries/stdlib/src/kotlin/StringsKt.java index 5b3ff5e8b60..0b4d6c3f2f6 100644 --- a/libraries/stdlib/src/kotlin/StringsKt.java +++ b/libraries/stdlib/src/kotlin/StringsKt.java @@ -17,6 +17,6 @@ package kotlin; @java.lang.Deprecated -@Deprecated(message = "Use kotlin.text.StringsKt instead") +@Deprecated(message = "Use kotlin.text.StringsKt instead", level = DeprecationLevel.HIDDEN) public class StringsKt extends kotlin.text.StringsKt { } diff --git a/libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt b/libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt index 32b5c2ea9f2..4096d35ee2e 100644 --- a/libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt +++ b/libraries/stdlib/src/kotlin/jvm/internal/unsafe/monitor.kt @@ -20,10 +20,10 @@ import kotlin.jvm.internal.Intrinsic /** @suppress */ @Intrinsic("kotlin.jvm.internal.unsafe.monitorEnter") -@Deprecated("This function supports the standard library infrastructure and is not intended to be used directly from user code.") +@Deprecated("This function supports the standard library infrastructure and is not intended to be used directly from user code.", level = DeprecationLevel.ERROR) public fun monitorEnter(monitor: Any): Unit = throw UnsupportedOperationException("This function can only be used privately") /** @suppress */ @Intrinsic("kotlin.jvm.internal.unsafe.monitorExit") -@Deprecated("This function supports the standard library infrastructure and is not intended to be used directly from user code.") +@Deprecated("This function supports the standard library infrastructure and is not intended to be used directly from user code.", level = DeprecationLevel.ERROR) public fun monitorExit(monitor: Any): Unit = throw UnsupportedOperationException("This function can only be used privately") diff --git a/libraries/stdlib/src/kotlin/util/Synchronized.kt b/libraries/stdlib/src/kotlin/util/Synchronized.kt index fbbca4192fe..e36d7c772d2 100644 --- a/libraries/stdlib/src/kotlin/util/Synchronized.kt +++ b/libraries/stdlib/src/kotlin/util/Synchronized.kt @@ -8,7 +8,7 @@ import kotlin.jvm.internal.unsafe.* /** * Executes the given function [block] while holding the monitor of the given object [lock]. */ -@Suppress("DEPRECATION") +@Suppress("DEPRECATION_ERROR") public inline fun synchronized(lock: Any, block: () -> R): R { monitorEnter(lock) try {