From 47a05e8bd6eaf9becd49cdd5e9bf6f8d1674d6e9 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 27 Aug 2015 19:36:57 +0300 Subject: [PATCH] Fix targets on stdlib annotations --- libraries/stdlib/src/kotlin/jvm/JvmFlagAnnotations.kt | 6 +++--- libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt | 2 +- libraries/stdlib/src/kotlin/platform/annotations.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/stdlib/src/kotlin/jvm/JvmFlagAnnotations.kt b/libraries/stdlib/src/kotlin/jvm/JvmFlagAnnotations.kt index 5d56db38898..139a1c29e1f 100644 --- a/libraries/stdlib/src/kotlin/jvm/JvmFlagAnnotations.kt +++ b/libraries/stdlib/src/kotlin/jvm/JvmFlagAnnotations.kt @@ -22,14 +22,14 @@ import kotlin.annotation.AnnotationTarget.* * Marks the JVM backing field of the annotated property as `volatile`, meaning that writes to this field * are immediately made visible to other threads. */ -target(PROPERTY, FIELD) +target(FIELD) public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = true) class volatile /** * Marks the JVM backing field of the annotated property as `transient`, meaning that it is not * part of the default serialized form of the object. */ -target(PROPERTY, FIELD) +target(FIELD) public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = true) class transient /** @@ -37,7 +37,7 @@ public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = tru * of floating point operations performed inside the method needs to be restricted in order to * achieve better portability. */ -target(FUNCTION, CONSTRUCTOR, PROPERTY, PROPERTY_GETTER, PROPERTY_SETTER, CLASSIFIER) +target(FUNCTION, CONSTRUCTOR, PROPERTY_GETTER, PROPERTY_SETTER, CLASSIFIER) public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = true) class strictfp /** diff --git a/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt b/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt index 9a87b2de3ff..71f72362a65 100644 --- a/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt +++ b/libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt @@ -47,5 +47,5 @@ public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = tr /** * Instructs the Kotlin compiler to generate a public backing field for this property. */ -target(AnnotationTarget.PROPERTY) +target(AnnotationTarget.FIELD) public annotation(retention = AnnotationRetention.SOURCE, mustBeDocumented = true) class publicField \ No newline at end of file diff --git a/libraries/stdlib/src/kotlin/platform/annotations.kt b/libraries/stdlib/src/kotlin/platform/annotations.kt index 332327de803..81baa172149 100644 --- a/libraries/stdlib/src/kotlin/platform/annotations.kt +++ b/libraries/stdlib/src/kotlin/platform/annotations.kt @@ -22,6 +22,6 @@ target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) deprecated("Use kotlin.jvm.jvmName instead", ReplaceWith("kotlin.jvm.jvmName")) public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class platformName(public val name: String) -target(FUNCTION, PROPERTY, FIELD, PROPERTY_GETTER, PROPERTY_SETTER) +target(FUNCTION, FIELD, PROPERTY, PROPERTY_GETTER, PROPERTY_SETTER) deprecated("Use kotlin.jvm.jvmStatic instead", ReplaceWith("kotlin.jvm.jvmStatic")) public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class platformStatic