rename platformStatic to jvmStatic

libraries/stdlib/src/kotlin/jvm/JvmPlatformAnnotations.kt

@@ -25,6 +25,15 @@ package kotlin.jvm
 target(AnnotationTarget.FUNCTION, AnnotationTarget.CONSTRUCTOR)
 public annotation(retention = AnnotationRetention.BINARY, mustBeDocumented = true) class jvmOverloads
 
+
+/**
+ * Specifies that a static method or field needs to be generated from this element.
+ * See the [Kotlin language documentation](http://kotlinlang.org/docs/reference/java-interop.html#static-methods-and-fields)
+ * for more information.
+ */
+target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.FIELD, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
+public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class jvmStatic
+
 /**
  * Instructs the Kotlin compiler to generate a public backing field for this property.
  */

libraries/stdlib/src/kotlin/platform/annotations.kt

@@ -28,10 +28,6 @@ import kotlin.annotation.AnnotationTarget.*
 target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER)
 public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class platformName(public val name: String)
 
-/**
- * Specifies that a static method or field needs to be generated from this element.
- * See the [Kotlin language documentation](http://kotlinlang.org/docs/reference/java-interop.html#static-methods-and-fields)
- * for more information.
- */
 target(FUNCTION, PROPERTY, FIELD, PROPERTY_GETTER, PROPERTY_SETTER)
+deprecated("Use kotlin.jvm.jvmStatic instead", ReplaceWith("kotlin.jvm.jvmStatic"))
 public annotation(retention = AnnotationRetention.RUNTIME, mustBeDocumented = true) class platformStatic