Make PropertyMetadata internal and deprecated with error

To make them inaccessible from Kotlin sources and drop them later. They're
still needed in runtime because Kotlin tests run old IDEA code (which depends
on PropertyMetadata) with our own runtime
This commit is contained in:
Alexander Udalov
2016-01-13 16:03:03 +03:00
parent d1f2255d38
commit 4a31ad0d53
4 changed files with 8 additions and 28 deletions
+1 -1
View File
@@ -1084,7 +1084,7 @@ public abstract class Number {
public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.Iterator<N>
}
@kotlin.Deprecated(message = "Please use KProperty instead.", replaceWith = kotlin.ReplaceWith(expression = "KProperty<*>", imports = {"kotlin.reflect.KProperty"})) public interface PropertyMetadata {
@kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Please use KProperty instead.", replaceWith = kotlin.ReplaceWith(expression = "KProperty<*>", imports = {"kotlin.reflect.KProperty"})) internal interface PropertyMetadata {
public abstract val name: kotlin.String
public abstract fun <get-name>(): kotlin.String
}
+3 -9
View File
@@ -16,13 +16,7 @@
package kotlin
/**
* Represents a property in a Kotlin class.
*/
@Deprecated("Please use KProperty instead.", ReplaceWith("KProperty<*>", "kotlin.reflect.KProperty"))
public interface PropertyMetadata {
/**
* The name of the property.
*/
public val name: String
@Deprecated("Please use KProperty instead.", ReplaceWith("KProperty<*>", "kotlin.reflect.KProperty"), DeprecationLevel.ERROR)
internal interface PropertyMetadata {
val name: String
}
@@ -14,6 +14,7 @@
* limitations under the License.
*/
@file:Suppress("DEPRECATION_ERROR", "EXPOSED_SUPER_INTERFACE", "INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") // for PropertyMetadata inheritance
package kotlin.reflect
/**
@@ -14,23 +14,8 @@
* limitations under the License.
*/
/*
* Copyright 2010-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package kotlin
@Deprecated("Please use KProperty instead.")
data class PropertyMetadataImpl(override val name: String) : PropertyMetadata
@Suppress("DEPRECATION_ERROR")
@Deprecated("Please use KProperty instead.", level = DeprecationLevel.ERROR)
internal data class PropertyMetadataImpl(override val name: String) : PropertyMetadata