From 4321969ba54eb629bf0aac3af3b20f69cb81dc8c Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Tue, 1 Sep 2015 15:59:00 +0300
Subject: [PATCH] Restored properties "java" and "kotlin" in package
 kotlin.reflect.jvm but made them hidden

---
 .../src/kotlin/reflect/jvm/_Deprecated.kt       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt
index 58b684da4af..49316f69bd9 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt
@@ -46,13 +46,12 @@ public var KProperty<*>.accessible: Boolean
     get() = isAccessible
     set(value) { isAccessible = value }
 
+@HiddenDeclaration
+@deprecated("Moved to package kotlin.jvm", ReplaceWith("java"))
+public val <T : Any> KClass<T>.java: Class<T>
+    get() = java
 
-@deprecated("Use .java instead.", ReplaceWith("java"))
-public val <T : Any> KClass<T>.__java: Class<T>
-    @jvmName("getJava")
-    get() = this.java
-
-@deprecated("Use .kotlin instead.", ReplaceWith("kotlin"))
-public val <T : Any> Class<T>.__kotlin: KClass<T>
-    @jvmName("getKotlin")
-    get() = this.kotlin
+@HiddenDeclaration
+@deprecated("Moved to package kotlin.jvm", ReplaceWith("kotlin"))
+public val <T : Any> Class<T>.kotlin: KClass<T>
+    get() = kotlin