diff --git a/compiler/testData/codegen/box/delegatedProperty/privateSetterKPropertyIsNotMutable.kt b/compiler/testData/codegen/box/delegatedProperty/privateSetterKPropertyIsNotMutable.kt index 8b9566f4315..68784f3f8fb 100644 --- a/compiler/testData/codegen/box/delegatedProperty/privateSetterKPropertyIsNotMutable.kt +++ b/compiler/testData/codegen/box/delegatedProperty/privateSetterKPropertyIsNotMutable.kt @@ -19,7 +19,7 @@ object Delegate { // OK } - property.accessible = true + property.isAccessible = true property.set(thiz, "") return "OK" diff --git a/compiler/testData/codegen/box/reflection/mapping/syntheticFields.kt b/compiler/testData/codegen/box/reflection/mapping/syntheticFields.kt index 56de0a5031f..953ce19205b 100644 --- a/compiler/testData/codegen/box/reflection/mapping/syntheticFields.kt +++ b/compiler/testData/codegen/box/reflection/mapping/syntheticFields.kt @@ -3,7 +3,7 @@ // WITH_REFLECT -import kotlin.reflect.jvm.kotlin +import kotlin.reflect.jvm.kotlinProperty enum class A { // There's a synthetic field "$VALUES" here @@ -11,7 +11,7 @@ enum class A { fun box(): String { for (field in A::class.java.getDeclaredFields()) { - val prop = field.kotlin + val prop = field.kotlinProperty if (prop != null) return "Fail, property found: $prop" } diff --git a/compiler/testData/codegen/box/reflection/properties/publicClassValAccessible.kt b/compiler/testData/codegen/box/reflection/properties/publicClassValAccessible.kt index b72145d9f0c..4be1ab8df8c 100644 --- a/compiler/testData/codegen/box/reflection/properties/publicClassValAccessible.kt +++ b/compiler/testData/codegen/box/reflection/properties/publicClassValAccessible.kt @@ -3,7 +3,7 @@ // WITH_REFLECT -import kotlin.reflect.jvm.accessible +import kotlin.reflect.jvm.isAccessible class Result { public val value: String = "OK" @@ -11,7 +11,7 @@ class Result { fun box(): String { val p = Result::value - p.accessible = false + p.isAccessible = false // setAccessible(false) should have no effect on the accessibility of a public reflection object return p.get(Result()) } diff --git a/compiler/testData/codegen/boxAgainstJava/reflection/mapping/javaFields.kt b/compiler/testData/codegen/boxAgainstJava/reflection/mapping/javaFields.kt index 58fa5f1f661..2d85dc1ec3e 100644 --- a/compiler/testData/codegen/boxAgainstJava/reflection/mapping/javaFields.kt +++ b/compiler/testData/codegen/boxAgainstJava/reflection/mapping/javaFields.kt @@ -46,8 +46,8 @@ fun box(): String { assert(a.s == "def") { "Fail js access" } // Check that valid Kotlin reflection objects are created by those Field objects - val ki = ji.kotlin as KProperty1 - val ks = js.kotlin as KMutableProperty1 + val ki = ji.kotlinProperty as KProperty1 + val ks = js.kotlinProperty as KMutableProperty1 assert(ki.get(a) == 42) { "Fail ki get" } assert(ks.get(a) == "def") { "Fail ks get" } ks.set(a, "ghi") diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt deleted file mode 100644 index 2018982f9f4..00000000000 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/_Deprecated.kt +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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.reflect.jvm - -import java.lang.reflect.Field -import kotlin.reflect.* - -@Deprecated("Use kotlinProperty instead.", ReplaceWith("kotlinProperty")) val Field.kotlin: KProperty<*>? - get() = kotlinProperty - - -@Deprecated("Use memberProperties instead.", ReplaceWith("memberProperties")) val KClass.properties: Collection> - get() = memberProperties - -@Deprecated("Use extensionProperties instead.", ReplaceWith("extensionProperties")) val KClass.extensionProperties: Collection> - get() = memberExtensionProperties - -@Deprecated("Use declaredMemberProperties instead.", ReplaceWith("declaredMemberProperties")) val KClass.declaredProperties: Collection> - get() = declaredMemberProperties - -@Deprecated("Use declaredMemberExtensionProperties instead.", ReplaceWith("declaredMemberExtensionProperties")) val KClass.declaredExtensionProperties: Collection> - get() = declaredMemberExtensionProperties - - -@Deprecated("Use isAccessible instead.", ReplaceWith("isAccessible")) var KProperty<*>.accessible: Boolean - get() = isAccessible - set(value) { isAccessible = value } - -@Deprecated("Moved to package kotlin.jvm", ReplaceWith("java"), level = DeprecationLevel.HIDDEN) val KClass.java: Class - get() = java - -@Deprecated("Moved to package kotlin.jvm", ReplaceWith("kotlin"), level = DeprecationLevel.HIDDEN) val Class.kotlin: KClass - get() = kotlin