From 10b76eacf04c99d1a7b7f9d7659d413b31864401 Mon Sep 17 00:00:00 2001
From: Pavel Punegov <pavel.punegov@jetbrains.com>
Date: Thu, 18 Oct 2018 17:17:58 +0300
Subject: [PATCH] Make ThreadLocal and SharedImmutable be actual classes for
 OptionalExpectations and move to kotlin.native.concurrent

---
 .../main/kotlin/kotlin/native/Annotations.kt   | 18 +++++++++++-------
 .../kotlin/native/concurrent/Annotations.kt    |  4 +++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/runtime/src/main/kotlin/kotlin/native/Annotations.kt b/runtime/src/main/kotlin/kotlin/native/Annotations.kt
index daa91f3a3f5..eb89c913b5d 100644
--- a/runtime/src/main/kotlin/kotlin/native/Annotations.kt
+++ b/runtime/src/main/kotlin/kotlin/native/Annotations.kt
@@ -40,6 +40,16 @@ public annotation class Retain
 @Retention(AnnotationRetention.SOURCE)
 public annotation class Throws(vararg val exceptionClasses: KClass<out Throwable>)
 
+@Deprecated("ThreadLocal was moved to kotlin.native.concurrent package " +
+        "and became available in Kotlin Common as optional annotation",
+        ReplaceWith("kotlin.native.concurrent.ThreadLocal"))
+public typealias ThreadLocal = kotlin.native.concurrent.ThreadLocal
+
+@Deprecated("SharedImmutable was moved to kotlin.native.concurrent package " +
+        "and became available in Kotlin Common as optional annotation",
+        ReplaceWith("kotlin.native.concurrent.SharedImmutable"))
+public typealias SharedImmutable = kotlin.native.concurrent.SharedImmutable
+
 /**
  * Makes top level function available from C/C++ code with the given name.
  *
@@ -48,10 +58,4 @@ public annotation class Throws(vararg val exceptionClasses: KClass<out Throwable
  */
 @Target(AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.BINARY)
-public annotation class CName(val externName: String = "", val shortName: String = "")
-
-@Deprecated("Please use kotlin.native.concurrent")
-typealias ThreadLocal = kotlin.native.concurrent.ThreadLocal
-
-@Deprecated("Please use kotlin.native.concurrent")
-typealias SharedImmutable = kotlin.native.concurrent.SharedImmutable
\ No newline at end of file
+public annotation class CName(val externName: String = "", val shortName: String = "")
\ No newline at end of file
diff --git a/runtime/src/main/kotlin/kotlin/native/concurrent/Annotations.kt b/runtime/src/main/kotlin/kotlin/native/concurrent/Annotations.kt
index 1f8afa1ec6a..2cfed5b8ebe 100644
--- a/runtime/src/main/kotlin/kotlin/native/concurrent/Annotations.kt
+++ b/runtime/src/main/kotlin/kotlin/native/concurrent/Annotations.kt
@@ -9,6 +9,7 @@ package kotlin.native.concurrent
  * Top level variable or object is thread local, and so could be mutable.
  * One may use this annotation as the stopgap measure for singleton
  * object immutability.
+ *
  * PLEASE NOTE THAT THIS ANNOTATION MAY GO AWAY IN UPCOMING RELEASES.
  */
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.CLASS)
@@ -17,8 +18,9 @@ public actual annotation class ThreadLocal
 
 /**
  * Top level variable is immutable and so could be shared.
+ *
  * PLEASE NOTE THAT THIS ANNOTATION MAY GO AWAY IN UPCOMING RELEASES.
  */
 @Target(AnnotationTarget.PROPERTY)
 @Retention(AnnotationRetention.BINARY)
-public actual annotation class SharedImmutable
+public actual annotation class SharedImmutable
\ No newline at end of file