Drop deprecated pre-1.0 API. Remove remaining usages in tests.
This commit is contained in:
+1
-1
@@ -19,7 +19,7 @@ object Delegate {
|
|||||||
// OK
|
// OK
|
||||||
}
|
}
|
||||||
|
|
||||||
property.accessible = true
|
property.isAccessible = true
|
||||||
property.set(thiz, "")
|
property.set(thiz, "")
|
||||||
|
|
||||||
return "OK"
|
return "OK"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
// WITH_REFLECT
|
// WITH_REFLECT
|
||||||
|
|
||||||
import kotlin.reflect.jvm.kotlin
|
import kotlin.reflect.jvm.kotlinProperty
|
||||||
|
|
||||||
enum class A {
|
enum class A {
|
||||||
// There's a synthetic field "$VALUES" here
|
// There's a synthetic field "$VALUES" here
|
||||||
@@ -11,7 +11,7 @@ enum class A {
|
|||||||
|
|
||||||
fun box(): String {
|
fun box(): String {
|
||||||
for (field in A::class.java.getDeclaredFields()) {
|
for (field in A::class.java.getDeclaredFields()) {
|
||||||
val prop = field.kotlin
|
val prop = field.kotlinProperty
|
||||||
if (prop != null) return "Fail, property found: $prop"
|
if (prop != null) return "Fail, property found: $prop"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
// WITH_REFLECT
|
// WITH_REFLECT
|
||||||
|
|
||||||
import kotlin.reflect.jvm.accessible
|
import kotlin.reflect.jvm.isAccessible
|
||||||
|
|
||||||
class Result {
|
class Result {
|
||||||
public val value: String = "OK"
|
public val value: String = "OK"
|
||||||
@@ -11,7 +11,7 @@ class Result {
|
|||||||
|
|
||||||
fun box(): String {
|
fun box(): String {
|
||||||
val p = Result::value
|
val p = Result::value
|
||||||
p.accessible = false
|
p.isAccessible = false
|
||||||
// setAccessible(false) should have no effect on the accessibility of a public reflection object
|
// setAccessible(false) should have no effect on the accessibility of a public reflection object
|
||||||
return p.get(Result())
|
return p.get(Result())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,8 +46,8 @@ fun box(): String {
|
|||||||
assert(a.s == "def") { "Fail js access" }
|
assert(a.s == "def") { "Fail js access" }
|
||||||
|
|
||||||
// Check that valid Kotlin reflection objects are created by those Field objects
|
// Check that valid Kotlin reflection objects are created by those Field objects
|
||||||
val ki = ji.kotlin as KProperty1<J, Int>
|
val ki = ji.kotlinProperty as KProperty1<J, Int>
|
||||||
val ks = js.kotlin as KMutableProperty1<J, String>
|
val ks = js.kotlinProperty as KMutableProperty1<J, String>
|
||||||
assert(ki.get(a) == 42) { "Fail ki get" }
|
assert(ki.get(a) == 42) { "Fail ki get" }
|
||||||
assert(ks.get(a) == "def") { "Fail ks get" }
|
assert(ks.get(a) == "def") { "Fail ks get" }
|
||||||
ks.set(a, "ghi")
|
ks.set(a, "ghi")
|
||||||
|
|||||||
@@ -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 <T : Any> KClass<T>.properties: Collection<KProperty1<T, *>>
|
|
||||||
get() = memberProperties
|
|
||||||
|
|
||||||
@Deprecated("Use extensionProperties instead.", ReplaceWith("extensionProperties")) val <T : Any> KClass<T>.extensionProperties: Collection<KProperty2<T, *, *>>
|
|
||||||
get() = memberExtensionProperties
|
|
||||||
|
|
||||||
@Deprecated("Use declaredMemberProperties instead.", ReplaceWith("declaredMemberProperties")) val <T : Any> KClass<T>.declaredProperties: Collection<KProperty1<T, *>>
|
|
||||||
get() = declaredMemberProperties
|
|
||||||
|
|
||||||
@Deprecated("Use declaredMemberExtensionProperties instead.", ReplaceWith("declaredMemberExtensionProperties")) val <T : Any> KClass<T>.declaredExtensionProperties: Collection<KProperty2<T, *, *>>
|
|
||||||
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 <T : Any> KClass<T>.java: Class<T>
|
|
||||||
get() = java
|
|
||||||
|
|
||||||
@Deprecated("Moved to package kotlin.jvm", ReplaceWith("kotlin"), level = DeprecationLevel.HIDDEN) val <T : Any> Class<T>.kotlin: KClass<T>
|
|
||||||
get() = kotlin
|
|
||||||
Reference in New Issue
Block a user