drop deprecated @platformName and @platformStatic annotations

compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt

@@ -66,7 +66,7 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) {
      *
      * @param functionDescriptor the method for which the overloads are generated
      * @param delegateFunctionDescriptor the method descriptor for the implementation that we need to call
-     *     (same as [functionDescriptor] in all cases except for companion object methods annotated with [platformStatic],
+     *     (same as [functionDescriptor] in all cases except for companion object methods annotated with @JvmStatic,
      *     where [functionDescriptor] is the static method in the main class and [delegateFunctionDescriptor] is the
      *     implementation in the companion object class)
      * @return true if the overloads annotation was found on the element, false otherwise
@@ -102,7 +102,7 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) {
      *
      * @param functionDescriptor the method for which the overloads are generated
      * @param delegateFunctionDescriptor the method descriptor for the implementation that we need to call
-     *     (same as [functionDescriptor] in all cases except for companion object methods annotated with [platformStatic],
+     *     (same as [functionDescriptor] in all cases except for companion object methods annotated with @JvmStatic,
      *     where [functionDescriptor] is the static method in the main class and [delegateFunctionDescriptor] is the
      *     implementation in the companion object class)
      * @param methodElement the PSI element for the method implementation (used in diagnostic messages only)

compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java

@@ -187,7 +187,7 @@ public class FunctionCodegen {
         boolean staticInCompanionObject = AnnotationUtilKt.isPlatformStaticInCompanionObject(functionDescriptor);
         if (staticInCompanionObject) {
             ImplementationBodyCodegen parentBodyCodegen = (ImplementationBodyCodegen) memberCodegen.getParentCodegen();
-            parentBodyCodegen.addAdditionalTask(new PlatformStaticGenerator(functionDescriptor, origin, state));
+            parentBodyCodegen.addAdditionalTask(new JvmStaticGenerator(functionDescriptor, origin, state));
         }
 
         if (state.getClassBuilderMode() == ClassBuilderMode.LIGHT_CLASSES || isAbstractMethod(functionDescriptor, contextKind)) {
@@ -209,9 +209,9 @@ public class FunctionCodegen {
             generateMethodBody(mv, functionDescriptor, methodContext, jvmSignature, strategy, memberCodegen);
         }
         else if (staticInCompanionObject) {
-            // native platformStatic foo() in companion object should delegate to the static native function moved to the outer class
+            // native @JvmStatic foo() in companion object should delegate to the static native function moved to the outer class
             mv.visitCode();
-            FunctionDescriptor staticFunctionDescriptor = PlatformStaticGenerator.createStaticFunctionDescriptor(functionDescriptor);
+            FunctionDescriptor staticFunctionDescriptor = JvmStaticGenerator.createStaticFunctionDescriptor(functionDescriptor);
             JvmMethodSignature jvmMethodSignature =
                     typeMapper.mapSignature(memberCodegen.getContext().accessibleDescriptor(staticFunctionDescriptor, null));
             Type owningType = typeMapper.mapClass((ClassifierDescriptor) staticFunctionDescriptor.getContainingDeclaration());

compiler/backend/src/org/jetbrains/kotlin/codegen/JvmStaticGenerator.kt

@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature
 import org.jetbrains.org.objectweb.asm.MethodVisitor
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
 
-class PlatformStaticGenerator(
+class JvmStaticGenerator(
         val descriptor: FunctionDescriptor,
         val declarationOrigin: JvmDeclarationOrigin,
         val state: GenerationState

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt

@@ -16,21 +16,15 @@
 
 package org.jetbrains.kotlin.cli.jvm
 
-import kotlin.platform.*
-import java.util.jar.JarFile
-import java.util.jar.Attributes
-import java.util.regex.Pattern
 import com.intellij.util.containers.MultiMap
-import java.net.URLClassLoader
-import java.net.URL
-import java.io.File
-import java.util.ServiceLoader
-import java.io.IOException
-import java.util.Enumeration
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.utils.valuesToMap
-import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.compiler.plugin.*
+import org.jetbrains.kotlin.config.CompilerConfiguration
+import org.jetbrains.kotlin.utils.valuesToMap
+import java.io.File
+import java.net.URL
+import java.net.URLClassLoader
+import java.util.*
 
 
 public object PluginCliParser {

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/declarationCheckers.kt

@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.DeclarationChecker
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.annotations.hasIntrinsicAnnotation
-import org.jetbrains.kotlin.resolve.annotations.hasPlatformStaticAnnotation
+import org.jetbrains.kotlin.resolve.annotations.hasJvmStaticAnnotation
 import org.jetbrains.kotlin.resolve.inline.InlineUtil
 import org.jetbrains.kotlin.resolve.jvm.annotations.hasJvmOverloadsAnnotation
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
@@ -58,7 +58,7 @@ public class PlatformStaticAnnotationChecker : DeclarationChecker {
             diagnosticHolder: DiagnosticSink,
             bindingContext: BindingContext
     ) {
-        if (descriptor.hasPlatformStaticAnnotation()) {
+        if (descriptor.hasJvmStaticAnnotation()) {
             if (declaration is KtNamedFunction || declaration is KtProperty || declaration is KtPropertyAccessor) {
                 checkDeclaration(declaration, descriptor, diagnosticHolder)
             }

compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.java

@@ -108,7 +108,7 @@ public class MainFunctionDetector {
         DeclarationDescriptor containingDeclaration = functionDescriptor.getContainingDeclaration();
         return containingDeclaration instanceof ClassDescriptor
                && ((ClassDescriptor) containingDeclaration).getKind().isSingleton()
-               && AnnotationUtilKt.hasPlatformStaticAnnotation(functionDescriptor);
+               && AnnotationUtilKt.hasJvmStaticAnnotation(functionDescriptor);
     }
 
     @Nullable

compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt

@@ -16,14 +16,13 @@
 
 package org.jetbrains.kotlin.kdoc.parser
 
+import com.intellij.lang.ASTNode
+import com.intellij.lang.PsiBuilder
+import com.intellij.lang.PsiBuilderFactory
 import com.intellij.lang.PsiParser
 import com.intellij.psi.tree.IElementType
-import com.intellij.lang.PsiBuilder
-import com.intellij.lang.ASTNode
-import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.lexer.KotlinLexer
-import com.intellij.lang.PsiBuilderFactory
+import org.jetbrains.kotlin.lexer.KtTokens
-import kotlin.platform.*
 
 /**
  * Parses the contents of a Markdown link in KDoc. Uses the standard Kotlin lexer.

compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt

@@ -22,13 +22,11 @@ import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
-import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 
-public fun DeclarationDescriptor.hasPlatformStaticAnnotation(): Boolean {
+public fun DeclarationDescriptor.hasJvmStaticAnnotation(): Boolean {
-    return getAnnotations().findAnnotation(FqName("kotlin.platform.platformStatic")) != null ||
+    return getAnnotations().findAnnotation(FqName("kotlin.jvm.JvmStatic")) != null
-           getAnnotations().findAnnotation(FqName("kotlin.jvm.JvmStatic")) != null
 }
 
 public fun DeclarationDescriptor.hasJvmSyntheticAnnotation(): Boolean {
@@ -52,9 +50,9 @@ private fun CallableDescriptor.isPlatformStaticIn(predicate: (DeclarationDescrip
             is PropertyAccessorDescriptor -> {
                 val propertyDescriptor = getCorrespondingProperty()
                 predicate(propertyDescriptor.getContainingDeclaration()) &&
-                (hasPlatformStaticAnnotation() || propertyDescriptor.hasPlatformStaticAnnotation())
+                (hasJvmStaticAnnotation() || propertyDescriptor.hasJvmStaticAnnotation())
             }
-            else -> predicate(getContainingDeclaration()) && hasPlatformStaticAnnotation()
+            else -> predicate(getContainingDeclaration()) && hasJvmStaticAnnotation()
         }
 
 public fun AnnotationDescriptor.argumentValue(parameterName: String): Any? {

compiler/testData/asJava/lightClassStructure/PlatformStaticMethodsGenerics.kt

@@ -1,10 +1,8 @@
 package test
 
-import kotlin.platform.platformStatic
-
 class PlatformStaticClass {
     companion object {
-        @platformStatic
+        @JvmStatic
         fun <T> inClassObject() {}
     }
 

compiler/testData/codegen/boxWithStdlib/callableReference/property/platformNamedAccessors.kt

@@ -1,10 +1,9 @@
-import kotlin.platform.platformName
 import kotlin.reflect.jvm.*
 
 var state: String = "value"
-    @platformName("getter")
+    @JvmName("getter")
     get
-    @platformName("setter")
+    @JvmName("setter")
     set
 
 fun box(): String {

compiler/testData/codegen/boxWithStdlib/fullJdk/native/default.kt

@@ -1,12 +1,11 @@
 package foo
 
 import kotlin.jvm.*
-import kotlin.platform.*
 
 object ObjWithNative {
     external fun foo(x: Int = 1): Double
 
-    @platformStatic external fun bar(l: Long, s: String = ""): Double
+    @JvmStatic external fun bar(l: Long, s: String = ""): Double
 }
 
 external fun topLevel(x: Int = 1): Double

compiler/testData/codegen/boxWithStdlib/fullJdk/native/privateStatic.kt

@@ -1,9 +1,8 @@
 import kotlin.jvm.*
-import kotlin.platform.*
 
 class C {
     companion object {
-        private @platformStatic external fun foo()
+        private @JvmStatic external fun foo()
     }
 
     fun bar() {

compiler/testData/codegen/boxWithStdlib/fullJdk/native/staticNative.kt

@@ -1,16 +1,15 @@
 package foo
 
 import kotlin.jvm.*
-import kotlin.platform.*
 
 class WithNative {
     companion object {
-        @platformStatic external fun bar(l: Long, s: String): Double
+        @JvmStatic external fun bar(l: Long, s: String): Double
     }
 }
 
 object ObjWithNative {
-    @platformStatic external fun bar(l: Long, s: String): Double
+    @JvmStatic external fun bar(l: Long, s: String): Double
 }
 
 fun box(): String {

compiler/testData/codegen/boxWithStdlib/fullJdk/native/topLevel.kt

@@ -1,7 +1,6 @@
 package foo
 
 import kotlin.jvm.*
-import kotlin.platform.*
 
 external fun bar(l: Long, s: String): Double
 

compiler/testData/codegen/boxWithStdlib/jvmName/callableReference.kt

@@ -1,6 +1,4 @@
-import kotlin.platform.*
+@JvmName("bar")
-
-@platformName("bar")
 fun foo() = "foo"
 
 fun box(): String {

compiler/testData/codegen/boxWithStdlib/jvmName/clashingErasure.kt

@@ -1,8 +1,6 @@
-import kotlin.platform.*
-
 fun <T> List<T>.foo() = "foo"
 
-@platformName("fooInt")
+@JvmName("fooInt")
 fun List<Int>.foo() = "fooInt"
 
 fun box(): String {

compiler/testData/codegen/boxWithStdlib/jvmName/classMembers.kt

@@ -1,5 +1,3 @@
-import kotlin.platform.*
-
 // See:
 // http://kotlinlang.org/docs/reference/java-interop.html#handling-signature-clashes-with-platformname
 // https://youtrack.jetbrains.com/issue/KT-5524
@@ -10,18 +8,18 @@ val ints = listOf(1, 2, 3)
 class C {
     // Instance methods
 
-    @platformName("instMethodStr")
+    @JvmName("instMethodStr")
     fun instMethod(list: List<String>): String = "instMethodStr"
 
-    @platformName("instMethodInt")
+    @JvmName("instMethodInt")
     fun instMethod(list: List<Int>): String = "instMethodInt"
 
     // Properties
 
     var rwProperty: Int
-        @platformName("get_rwProperty")
+        @JvmName("get_rwProperty")
         get() = 123
-        @platformName("set_rwProperty")
+        @JvmName("set_rwProperty")
         set(v) {}
 
     var rwValue = 111
@@ -36,27 +34,27 @@ class C {
 
     class Inner
 
-    @platformName("extMethodWithGenericParamStr")
+    @JvmName("extMethodWithGenericParamStr")
     fun Inner.extMethodWithGenericParam(list: List<String>): String = "extMethodWithGenericParamStr"
 
-    @platformName("extMethodWithGenericParamInt")
+    @JvmName("extMethodWithGenericParamInt")
     fun Inner.extMethodWithGenericParam(list: List<Int>): String = "extMethodWithGenericParamInt"
 
     // This is already covered by extMethodWithGenericParam(), but might be relevant for a platform
     // with extension method code generation strategy different from Java 6.
 
-    @platformName("extMethodWithGenericReceiverStr")
+    @JvmName("extMethodWithGenericReceiverStr")
     fun List<String>.extMethodWithGenericReceiver(): String = "extMethodWithGenericReceiverStr"
 
-    @platformName("extMethodWithGenericReceiverInt")
+    @JvmName("extMethodWithGenericReceiverInt")
     fun List<Int>.extMethodWithGenericReceiver(): String = "extMethodWithGenericReceiverInt"
 
     // Extension method vs instance method
 
-    @platformName("ambigMethod1")
+    @JvmName("ambigMethod1")
     fun ambigMethod(str: String): String = "ambigMethod1"
 
-    @platformName("ambigMethod2")
+    @JvmName("ambigMethod2")
     fun String.ambigMethod(): String = "ambigMethod2"
 
 }

compiler/testData/codegen/boxWithStdlib/jvmName/functionName.kt

@@ -1,6 +1,4 @@
-import kotlin.platform.*
+@JvmName("bar")
-
-@platformName("bar")
 fun foo() = "foo"
 
 fun box(): String {

compiler/testData/codegen/boxWithStdlib/jvmName/propertyName.kt

@@ -1,9 +1,7 @@
-import kotlin.platform.*
-
 var v: Int = 1
-    @platformName("vget")
+    @JvmName("vget")
     get
-    @platformName("vset")
+    @JvmName("vset")
     set
 
 fun box(): String {

compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt

@@ -1,6 +1,6 @@
 class C {
     companion object {
-        @kotlin.platform.platformStatic @kotlin.jvm.JvmOverloads public fun foo(o: String, k: String = "K"): String {
+        @JvmStatic @kotlin.jvm.JvmOverloads public fun foo(o: String, k: String = "K"): String {
             return o + k
         }
     }

compiler/testData/codegen/boxWithStdlib/jvmStatic/closure.kt

@@ -1,16 +1,14 @@
-import kotlin.platform.platformStatic
-
 object A {
 
     val b: String = "OK"
 
-    @platformStatic val c: String = "OK"
+    @JvmStatic val c: String = "OK"
 
-    @platformStatic fun test1() : String {
+    @JvmStatic fun test1() : String {
         return {b}()
     }
 
-    @platformStatic fun test2() : String {
+    @JvmStatic fun test2() : String {
         return {test1()}()
     }
 
@@ -18,11 +16,11 @@ object A {
         return {"1".test5()}()
     }
 
-    @platformStatic fun test4(): String {
+    @JvmStatic fun test4(): String {
         return {"1".test5()}()
     }
 
-    @platformStatic fun String.test5() : String {
+    @JvmStatic fun String.test5() : String {
         return {this + b}()
     }
 

compiler/testData/codegen/boxWithStdlib/jvmStatic/convention.kt

@@ -1,5 +1,3 @@
-import kotlin.platform.platformStatic
-
 class B(var s: Int = 0) {
 
 }
@@ -10,7 +8,7 @@ object A {
         v += B(1000)
     }
 
-    @platformStatic fun B.plusAssign(b: B) {
+    @JvmStatic fun B.plusAssign(b: B) {
         this.s += b.s
     }
 }

compiler/testData/codegen/boxWithStdlib/jvmStatic/default.kt

@@ -1,8 +1,6 @@
-import kotlin.platform.platformStatic
-
 object A {
 
-    @platformStatic fun test(b: String = "OK") : String {
+    @JvmStatic fun test(b: String = "OK") : String {
         return b
     }
 }

compiler/testData/codegen/boxWithStdlib/jvmStatic/explicitObject.kt

@@ -1,10 +1,8 @@
-import kotlin.platform.platformStatic
-
 object AX {
 
-    @platformStatic val c: String = "OK"
+    @JvmStatic val c: String = "OK"
 
-    @platformStatic fun aStatic(): String {
+    @JvmStatic fun aStatic(): String {
         return AX.b()
     }
 
@@ -12,7 +10,7 @@ object AX {
         return AX.b()
     }
 
-    @platformStatic fun b(): String {
+    @JvmStatic fun b(): String {
         return "OK"
     }
 

compiler/testData/codegen/boxWithStdlib/jvmStatic/funAccess.kt

@@ -1,5 +1,3 @@
-import kotlin.platform.platformStatic
-
 var holder = ""
 
 fun getA(): A {
@@ -8,7 +6,7 @@ fun getA(): A {
 }
 
 object A {
-    @platformStatic fun a(): String {
+    @JvmStatic fun a(): String {
         return holder
     }
 }

compiler/testData/codegen/boxWithStdlib/jvmStatic/inline.kt

@@ -1,8 +1,6 @@
-import kotlin.platform.platformStatic
-
 object A {
 
-    @platformStatic inline fun test(b: String = "OK") : String {
+    @JvmStatic inline fun test(b: String = "OK") : String {
         return b
     }
 }

compiler/testData/codegen/boxWithStdlib/jvmStatic/postfixInc.kt

@@ -1,14 +1,12 @@
-import kotlin.platform.platformStatic
-
 object A {
 
-    @platformStatic var a: Int = 1
+    @JvmStatic var a: Int = 1
 
     var b: Int = 1
-        @platformStatic get
+        @JvmStatic get
 
     var c: Int = 1
-        @platformStatic set
+        @JvmStatic set
 
 }
 

compiler/testData/codegen/boxWithStdlib/jvmStatic/prefixInc.kt

@@ -1,14 +1,12 @@
-import kotlin.platform.platformStatic
-
 object A {
 
-    @platformStatic var a: Int = 1
+    @JvmStatic var a: Int = 1
 
     var b: Int = 1
-        @platformStatic get
+        @JvmStatic get
 
     var c: Int = 1
-        @platformStatic set
+        @JvmStatic set
 
 }
 

compiler/testData/codegen/boxWithStdlib/jvmStatic/privateMethod.kt

@@ -1,8 +1,6 @@
-import kotlin.platform.platformStatic
-
 object A {
 
-    private @platformStatic fun a(): String {
+    private @JvmStatic fun a(): String {
         return "OK"
     }
 

compiler/testData/codegen/boxWithStdlib/jvmStatic/propertyAccess.kt

@@ -1,5 +1,3 @@
-import kotlin.platform.platformStatic
-
 var holder = ""
 
 fun getA(): A {
@@ -9,13 +7,13 @@ fun getA(): A {
 
 object A {
 
-    @platformStatic var a: Int = 1
+    @JvmStatic var a: Int = 1
 
     var b: Int = 1
-        @platformStatic get
+        @JvmStatic get
 
     var c: Int = 1
-        @platformStatic set
+        @JvmStatic set
 
 }
 

compiler/testData/codegen/boxWithStdlib/jvmStatic/propertyAsDefault.kt

@@ -1,7 +1,5 @@
-import kotlin.platform.platformStatic
-
 object X {
-    @platformStatic val x = "OK"
+    @JvmStatic val x = "OK"
 
     fun fn(value : String = x): String = value
 }

compiler/testData/codegen/boxWithStdlib/jvmStatic/simple.kt

@@ -1,16 +1,14 @@
-import kotlin.platform.platformStatic
-
 object A {
 
     val b: String = "OK"
 
-    @platformStatic val c: String = "OK"
+    @JvmStatic val c: String = "OK"
 
-    @platformStatic fun test1() : String {
+    @JvmStatic fun test1() : String {
         return b
     }
 
-    @platformStatic fun test2() : String {
+    @JvmStatic fun test2() : String {
         return test1()
     }
 
@@ -18,11 +16,11 @@ object A {
         return "1".test5()
     }
 
-    @platformStatic fun test4(): String {
+    @JvmStatic fun test4(): String {
         return "1".test5()
     }
 
-    @platformStatic fun String.test5() : String {
+    @JvmStatic fun String.test5() : String {
         return this + b
     }
 }

compiler/testData/codegen/boxWithStdlib/jvmStatic/syntheticAccessor.kt

@@ -1,8 +1,6 @@
-import kotlin.platform.*
-
 class C {
     companion object {
-        private @platformStatic fun foo(): String {
+        private @JvmStatic fun foo(): String {
             return "OK"
         }
     }

compiler/testData/codegen/boxWithStdlib/reflection/call/returnUnit.kt

@@ -7,7 +7,7 @@ class A {
 }
 
 object O {
-    @kotlin.platform.platformStatic fun baz() {}
+    @JvmStatic fun baz() {}
 }
 
 fun nullableUnit(unit: Boolean): Unit? = if (unit) Unit else null

compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt6106.kt

@@ -1,13 +1,11 @@
 package test
 
-import kotlin.platform.platformStatic
-
 open class B
 
 class A {
 
     companion object {
-        @platformStatic
+        @JvmStatic
         fun <T: B> a(s: T) : T {
             return s
         }

compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.kt

@@ -1,20 +1,18 @@
 package test
 
-import kotlin.platform.platformStatic
-
 class A {
 
     companion object {
         val b: String = "OK"
 
-        @platformStatic fun test1() {
+        @JvmStatic fun test1() {
             b
             test2()
             test3()
             "".test4()
         }
 
-        @platformStatic fun test2() {
+        @JvmStatic fun test2() {
             b
         }
 
@@ -22,7 +20,7 @@ class A {
 
         }
 
-        @platformStatic fun String.test4() {
+        @JvmStatic fun String.test4() {
             b
         }
     }

compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.txt

@@ -8,10 +8,10 @@ public final class A {
     public companion object Companion {
         private constructor Companion()
         public final val b: kotlin.String
-        @kotlin.platform.platformStatic() public final fun test1(): kotlin.Unit
+        @kotlin.jvm.JvmStatic() public final fun test1(): kotlin.Unit
-        @kotlin.platform.platformStatic() public final fun test2(): kotlin.Unit
+        @kotlin.jvm.JvmStatic() public final fun test2(): kotlin.Unit
         public final fun test3(): kotlin.Unit
-        @kotlin.platform.platformStatic() public final fun kotlin.String.test4(): kotlin.Unit
+        @kotlin.jvm.JvmStatic() public final fun kotlin.String.test4(): kotlin.Unit
     }
 }
 

compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.kt

@@ -1,14 +1,12 @@
 package test
 
-import kotlin.platform.platformStatic
-
 class A {
     companion object {
-        @platformStatic val b: String = "OK"
+        @JvmStatic val b: String = "OK"
 
         var A.c: String
-            @platformStatic get() = "OK"
+            @JvmStatic get() = "OK"
-            @platformStatic set(t: String) {}
+            @JvmStatic set(t: String) {}
     }
 }
 

compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.txt

@@ -7,7 +7,7 @@ public final class A {
 
     public companion object Companion {
         private constructor Companion()
-        @kotlin.platform.platformStatic() public final val b: kotlin.String
+        @kotlin.jvm.JvmStatic() public final val b: kotlin.String
         public final var test.A.c: kotlin.String
     }
 }

compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObject.kt

@@ -1,19 +1,17 @@
 package test
 
-import kotlin.platform.platformStatic
-
 object A {
 
     val b: String = "OK"
 
-    @platformStatic fun test1() {
+    @JvmStatic fun test1() {
         b
         test2()
         test3()
         "".test4()
     }
 
-    @platformStatic fun test2() {
+    @JvmStatic fun test2() {
         b
     }
 
@@ -21,7 +19,7 @@ object A {
 
     }
 
-    @platformStatic fun String.test4() {
+    @JvmStatic fun String.test4() {
         b
     }
 }

compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObject.txt

@@ -5,10 +5,10 @@ public fun main(/*0*/ kotlin.Array<kotlin.String>): kotlin.Unit
 public object A {
     private constructor A()
     public final val b: kotlin.String
-    @kotlin.platform.platformStatic() public final fun test1(): kotlin.Unit
+    @kotlin.jvm.JvmStatic() public final fun test1(): kotlin.Unit
-    @kotlin.platform.platformStatic() public final fun test2(): kotlin.Unit
+    @kotlin.jvm.JvmStatic() public final fun test2(): kotlin.Unit
     public final fun test3(): kotlin.Unit
-    @kotlin.platform.platformStatic() public final fun kotlin.String.test4(): kotlin.Unit
+    @kotlin.jvm.JvmStatic() public final fun kotlin.String.test4(): kotlin.Unit
 }
 
 public/*package*/ open class Test {

compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.kt

@@ -1,13 +1,11 @@
 package test
 
-import kotlin.platform.platformStatic
-
 object A {
-    @platformStatic val b: String = "OK"
+    @JvmStatic val b: String = "OK"
 
     var A.c: String
-        @platformStatic get() = "OK"
+        @JvmStatic get() = "OK"
-        @platformStatic set(t: String) {}
+        @JvmStatic set(t: String) {}
 
 }
 

compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.txt

@@ -4,7 +4,7 @@ public fun main(/*0*/ kotlin.Array<kotlin.String>): kotlin.Unit
 
 public object A {
     private constructor A()
-    @kotlin.platform.platformStatic() public final val b: kotlin.String
+    @kotlin.jvm.JvmStatic() public final val b: kotlin.String
     public final var test.A.c: kotlin.String
 }
 

compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.kt

@@ -1,9 +1,7 @@
 package test
 
-import kotlin.platform.*
-
 var v: Int = 1
-    @platformName("vget")
+    @JvmName("vget")
     get
-    @platformName("vset")
+    @JvmName("vset")
     set

compiler/testData/compileKotlinAgainstKotlin/PlatformNames.A.kt

@@ -1,12 +1,10 @@
 package lib
 
-import kotlin.platform.*
+@JvmName("bar")
-
-@platformName("bar")
 fun foo() = "foo"
 
 var v: Int = 1
-    @platformName("vget")
+    @JvmName("vget")
     get
-    @platformName("vset")
+    @JvmName("vset")
     set

compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.kt

@@ -1,18 +1,16 @@
 package test
 
-import kotlin.platform.*
-
 annotation class A(val s: String)
 
-@platformName("bar")
 @A("1")
+@JvmName("bar")
 fun foo() = "foo"
 
 @field:A("2")
 var v: Int = 1
-    @platformName("vget")
     @A("3")
+    @JvmName("vget")
     get
-    @platformName("vset")
     @A("4")
+    @JvmName("vset")
     set

compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.txt

@@ -1,9 +1,9 @@
 package test
 
 @field:test.A(s = "2") public var v: kotlin.Int
-    @kotlin.platform.platformName(name = "vget") @test.A(s = "3") public fun <get-v>(): kotlin.Int
+    @test.A(s = "3") @kotlin.jvm.JvmName(name = "vget") public fun <get-v>(): kotlin.Int
-    @kotlin.platform.platformName(name = "vset") @test.A(s = "4") public fun <set-v>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
+    @test.A(s = "4") @kotlin.jvm.JvmName(name = "vset") public fun <set-v>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
-@kotlin.platform.platformName(name = "bar") @test.A(s = "1") public fun foo(): kotlin.String
+@test.A(s = "1") @kotlin.jvm.JvmName(name = "bar") public fun foo(): kotlin.String
 
 public final annotation class A : kotlin.Annotation {
     /*primary*/ public constructor A(/*0*/ s: kotlin.String)

core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java

@@ -50,7 +50,6 @@ public class DescriptorUtils {
     public static final Name ENUM_VALUES = Name.identifier("values");
     public static final Name ENUM_VALUE_OF = Name.identifier("valueOf");
     public static final FqName JVM_NAME = new FqName("kotlin.jvm.JvmName");
-    public static final FqName PLATFORM_NAME = new FqName("kotlin.platform.platformName");
     public static final FqName VOLATILE = new FqName("kotlin.jvm.Volatile");
     public static final FqName SYNCHRONIZED = new FqName("kotlin.jvm.Synchronized");
 
@@ -531,9 +530,6 @@ public class DescriptorUtils {
     @Nullable
     public static AnnotationDescriptor getJvmNameAnnotation(@NotNull Annotations annotations) {
         AnnotationWithTarget jvmName = Annotations.Companion.findAnyAnnotation(annotations, JVM_NAME);
-        if (jvmName == null) {
-            jvmName = Annotations.Companion.findAnyAnnotation(annotations, PLATFORM_NAME);
-        }
         return jvmName == null ? null : jvmName.getAnnotation();
     }
 

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt

@@ -61,7 +61,6 @@ internal open class KFunctionImpl protected constructor(
             is Constructor<*> -> FunctionCaller.Constructor(member)
             is Method -> when {
                 !Modifier.isStatic(member.modifiers) -> FunctionCaller.InstanceMethod(member)
-                descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null,
                 descriptor.annotations.findAnnotation(JVM_STATIC) != null ->
                     FunctionCaller.JvmStaticInObject(member)
 
@@ -90,7 +89,6 @@ internal open class KFunctionImpl protected constructor(
         when (member) {
             is Constructor<*> -> FunctionCaller.Constructor(member)
             is Method -> when {
-                descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null,
                 descriptor.annotations.findAnnotation(JVM_STATIC) != null ->
                     FunctionCaller.JvmStaticInObject(member)
 

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt

@@ -97,7 +97,6 @@ private fun KPropertyImpl.Accessor<*>.computeCallerForAccessor(isGetter: Boolean
         return false
     }
     fun isJvmStaticProperty() =
-            property.descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null ||
             property.descriptor.annotations.findAnnotation(JVM_STATIC) != null
 
 

core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt

@@ -19,7 +19,6 @@ package kotlin.reflect.jvm.internal
 import org.jetbrains.kotlin.name.FqName
 import kotlin.reflect.IllegalCallableAccessException
 
-internal val PLATFORM_STATIC = FqName("kotlin.platform.platformStatic")
 internal val JVM_STATIC = FqName("kotlin.jvm.JvmStatic")
 
 // TODO: wrap other exceptions

core/runtime.jvm/src/kotlin/jvm/internal/CallableReference.java

@@ -45,7 +45,7 @@ public abstract class CallableReference implements KCallable {
     }
 
     /**
-     * @return Kotlin name of the callable, the one which was declared in the source code (@platformName doesn't change it)
+     * @return Kotlin name of the callable, the one which was declared in the source code (@JvmName doesn't change it)
      */
     @Override
     public String getName() {

idea/idea-completion/testData/smart/callableReference/NoQualifier11.kt.disabled

@@ -1,5 +1,3 @@
-import kotlin.platform.platformName
-
 class C(i: Int){
     class Nested
     inner class Inner
@@ -9,10 +7,10 @@ class C(i: Int){
     }
 }
 
-platformName("foo1")
+@JvmName("foo1")
 fun foo(p: () -> C.Nested){}
 
-platformName("foo2")
+@JvmName("foo2")
 fun foo(p: () -> C.Inner){}
 
 // EXIST: ::Nested

idea/testData/copyPaste/conversion/AddImportsClassInSamePackage.dependency.kt

@@ -1,8 +1,6 @@
 package ppp
 
-import kotlin.platform.platformStatic
-
 public object Dependency {
-    @platformStatic
+    @JvmStatic
     public val FIELD: Int = 1
 }

idea/testData/findUsages/kotlin/companionObject/javaUsage.0.kt

@@ -1,14 +1,12 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtObjectDeclaration
 // OPTIONS: usages
 
-import kotlin.platform.platformStatic
-
 class Foo {
     companion <caret>object {
         fun f() {
         }
 
-        @platformStatic fun s() {
+        @JvmStatic fun s() {
         }
 
         val CONST = 42

idea/testData/inspections/unusedSymbol/object/companionObjectUsedInJava.kt

@@ -1,7 +1,5 @@
 package companionObjectUsedInJava
 
-import kotlin.platform.platformStatic
-
 class A {
     companion object {
         val CONST = 42
@@ -10,7 +8,7 @@ class A {
 
 class B {
     companion object {
-        platformStatic fun foo() {
+        @JvmStatic fun foo() {
         }
     }
 }
@@ -23,7 +21,7 @@ class C {
 
 class D {
     companion object Named {
-        platformStatic fun foo() {
+        @JvmStatic fun foo() {
         }
     }
 }

idea/testData/inspections/unusedSymbol/object/companionObjectWithStatics.kt

@@ -2,7 +2,7 @@ package companionObjectWithStatics
 
 class Foo {
     companion object {
-        platformStatic fun foo() {
+        @JvmStatic fun foo() {
         }
 
         val CONST = 111

idea/testData/inspections/unusedSymbol/object/unusedButEntryPointMain.kt

@@ -2,10 +2,8 @@ package entryPoint
 
 // WITH_RUNTIME
 
-import kotlin.platform.platformStatic
-
 object EntryPoint {
-    @platformStatic public fun main(args: Array<String>) {
+    @JvmStatic public fun main(args: Array<String>) {
 
     }
 }

idea/testData/inspections/unusedSymbol/property/serialVersionUid.kt

@@ -1,10 +1,8 @@
 // FULL_JDK
 
-import kotlin.platform.platformStatic
-
 class Klass : java.io.Serializable {
     companion object {
-        private platformStatic val serialVersionUID: Long = 239
+        private @JvmStatic val serialVersionUID: Long = 239
     }
 }
 

idea/testData/refactoring/rename/companionObject/after/toBeRenamed.kt

@@ -3,7 +3,7 @@ class Foo {
         fun f() {
         }
 
-        platformStatic fun s() {
+        @JvmStatic fun s() {
         }
 
         val CONST = 42

idea/testData/refactoring/rename/companionObject/before/toBeRenamed.kt

@@ -3,7 +3,7 @@ class Foo {
         fun f() {
         }
 
-        platformStatic fun s() {
+        @JvmStatic fun s() {
         }
 
         val CONST = 42

idea/testData/refactoring/rename/companionObjectWithDefaultName/after/toBeRenamed.kt

@@ -3,7 +3,7 @@ class Foo {
         fun f() {
         }
 
-        platformStatic fun s() {
+        @JvmStatic fun s() {
         }
 
         val CONST = 42

idea/testData/refactoring/rename/companionObjectWithDefaultName/before/toBeRenamed.kt

@@ -3,7 +3,7 @@ class Foo {
         fun f() {
         }
 
-        platformStatic fun s() {
+        @JvmStatic fun s() {
         }
 
         val CONST = 42

idea/testData/refactoring/rename/companionObjectWithNameMatchingClass/after/toBeRenamed.kt

@@ -3,7 +3,7 @@ class Foo {
         fun f() {
         }
 
-        platformStatic fun s() {
+        @JvmStatic fun s() {
         }
 
         val CONST = 42

idea/testData/refactoring/rename/companionObjectWithNameMatchingClass/before/toBeRenamed.kt

@@ -3,7 +3,7 @@ class Foo {
         fun f() {
         }
 
-        platformStatic fun s() {
+        @JvmStatic fun s() {
         }
 
         val CONST = 42

idea/testData/resolve/referenceInJava/dependencies.kt

@@ -1,7 +1,5 @@
 package k
 
-import kotlin.platform.platformStatic
-
 public class Class() {
     public val prop: Int = 0
     fun function() = 1
@@ -32,7 +30,7 @@ public interface StaticFieldInClassObjectInTrait {
 }
 
 object PlatformStaticFun {
-    platformStatic
+    @JvmStatic
     fun test() {
     }
 }

idea/testData/run/ClassesAndObjects/module/src/test.kt

@@ -1,11 +1,9 @@
 package q
 
-import kotlin.platform.platformStatic
-
 // RUN: q.Foo
 object Foo {
     // RUN: q.Foo
-    @platformStatic fun main(s: Array<String>) {
+    @JvmStatic fun main(s: Array<String>) {
         println("Foo")
     }
 
@@ -13,7 +11,7 @@ object Foo {
     class InnerFoo {
         companion object {
             // RUN: q.Foo.InnerFoo
-            @platformStatic fun main(s: Array<String>) {
+            @JvmStatic fun main(s: Array<String>) {
                 println("InnerFoo")
             }
         }
@@ -22,7 +20,7 @@ object Foo {
     // RUN: q.Foo
     class InnerFoo2 {
         // RUN: q.Foo
-        @platformStatic fun main(s: Array<String>) {
+        @JvmStatic fun main(s: Array<String>) {
             println("InnerFoo")
         }
     }
@@ -40,7 +38,7 @@ object Foo2 {
 class Bar {
     companion object {
         // RUN: q.Bar
-        @platformStatic fun main(s: Array<String>) {
+        @JvmStatic fun main(s: Array<String>) {
             println("Bar")
         }
     }
@@ -59,7 +57,7 @@ class Bar2 {
 // RUN: q.TestKt
 class Baz {
     // RUN: q.TestKt
-    platformStatic fun main(s: Array<String>) {
+    @JvmStatic fun main(s: Array<String>) {
         println("Baz")
     }
 }

idea/testData/run/MainInTest/module/src/mainInCompanion.kt

@@ -1,11 +1,8 @@
 package companions
 
-import kotlin.platform.platformName
-import kotlin.platform.platformStatic
-
 class A {
     companion object {
-        @platformStatic
+        @JvmStatic
         fun main(args: Array<String>) {
             // yes
         }
@@ -22,8 +19,8 @@ class B {
 
 class C {
     companion object {
-        @platformStatic
+        @JvmStatic
-        @platformName("main0")
+        @JvmName("main0")
         fun main(args: Array<String>) { // no
         }
     }
@@ -31,8 +28,8 @@ class C {
 
 class D {
     companion object {
-        @platformStatic
+        @JvmStatic
-        @platformName("main")
+        @JvmName("main")
         fun badName(args: Array<String>) { // yes
         }
     }

idea/testData/run/MainInTest/module/src/mainInPackageNamedInvalid.kt

@@ -1,8 +1,6 @@
 package pkg2
 
-import kotlin.platform.platformName
+@JvmName("aa")
-
-@platformName("aa")
 fun main(args: Array<String>) {
     // no
 }

idea/testData/run/MainInTest/module/src/mainInPackageNamedValid.kt

@@ -1,8 +1,6 @@
 package pkg3
 
-import kotlin.platform.platformName
+@JvmName("main")
-
-@platformName("main")
 fun aaa(args: Array<String>) {
     // yes
 }

idea/testData/run/UpdateOnClassRename/module/src/Foo.kt

@@ -1,8 +1,6 @@
 package renameTest
 
-import kotlin.platform.platformStatic
-
 object Foo {
-    @platformStatic fun main(args: Array<String>) {
+    @JvmStatic fun main(args: Array<String>) {
     }
 }

idea/testData/run/UpdateOnPackageRename/module/src/renameTest/Foo.kt

@@ -1,8 +1,6 @@
 package renameTest
 
-import kotlin.platform.platformStatic
-
 object Foo {
-    @platformStatic fun main(args: Array<String>) {
+    @JvmStatic fun main(args: Array<String>) {
     }
 }

j2k/src/org/jetbrains/kotlin/j2k/CodeBuilder.kt

@@ -28,7 +28,6 @@ import org.jetbrains.kotlin.psi.psiUtil.isAncestor
 import java.util.ArrayList
 import java.util.HashSet
 import java.util.LinkedHashSet
-import kotlin.platform.platformName
 
 fun<T> CodeBuilder.buildList(generators: Collection<() -> T>, separator: String, prefix: String = "", suffix: String = ""): CodeBuilder {
     if (generators.isNotEmpty()) {

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

@@ -1,31 +0,0 @@
-/*
- * Copyright 2010-2014 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.platform
-
-import kotlin.annotation.AnnotationTarget.*
-
-@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER)
-@Retention(AnnotationRetention.RUNTIME)
-@MustBeDocumented
-@Deprecated("Use kotlin.jvm.JvmName instead", ReplaceWith("kotlin.jvm.JvmName"))
-public annotation class platformName(public val name: String)
-
-@Target(FUNCTION, PROPERTY, PROPERTY_GETTER, PROPERTY_SETTER)
-@Retention(AnnotationRetention.RUNTIME)
-@MustBeDocumented
-@Deprecated("Use kotlin.jvm.JvmStatic instead", ReplaceWith("kotlin.jvm.JvmStatic"))
-public annotation class platformStatic