Get rid of deprecated annotations and modifiers in project code

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt

@@ -45,7 +45,6 @@ import org.jetbrains.kotlin.types.typeUtil.createProjection
 import org.jetbrains.kotlin.types.typeUtil.replaceAnnotations
 import org.jetbrains.kotlin.utils.sure
 import java.util.HashSet
-import kotlin.platform.platformStatic
 
 private val JAVA_LANG_CLASS_FQ_NAME: FqName = FqName("java.lang.Class")
 
@@ -288,12 +287,13 @@ class LazyJavaTypeResolver(
     }
 
     public object FlexibleJavaClassifierTypeCapabilities : FlexibleTypeCapabilities {
-        platformStatic fun create(lowerBound: JetType, upperBound: JetType) = DelegatingFlexibleType.create(lowerBound, upperBound, this)
+        @JvmStatic
+        fun create(lowerBound: JetType, upperBound: JetType) = DelegatingFlexibleType.create(lowerBound, upperBound, this)
 
         override val id: String get() = "kotlin.jvm.PlatformType"
 
         override fun <T : TypeCapability> getCapability(capabilityClass: Class<T>, jetType: JetType, flexibility: Flexibility): T? {
-            @suppress("UNCHECKED_CAST")
+            @Suppress("UNCHECKED_CAST")
             return when (capabilityClass) {
                 javaClass<CustomTypeVariable>(), javaClass<Specificity>() -> Impl(flexibility) as T
                 else -> null

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/RawType.kt

@@ -70,7 +70,7 @@ public object RawTypeCapabilities : TypeCapabilities {
     }
 
     override fun <T : TypeCapability> getCapability(capabilityClass: Class<T>): T? {
-        @suppress("UNCHECKED_CAST")
+        @Suppress("UNCHECKED_CAST")
         return when(capabilityClass) {
             javaClass<CustomSubstitutionCapability>() -> RawSubstitutionCapability as T
             javaClass<CustomFlexibleRendering>() -> RawFlexibleRendering as T

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhacement/signatureEnhancement.kt

@@ -43,7 +43,7 @@ public fun <D : CallableMemberDescriptor> D.enhanceSignature(): D {
     val enhancedReturnType = parts(isCovariant = true) { it.getReturnType()!! }.enhance()
 
     if (this is JavaCallableMemberDescriptor) {
-        @suppress("UNCHECKED_CAST")
+        @Suppress("UNCHECKED_CAST")
         return this.enhance(enhancedReceiverType, enhancedValueParametersTypes, enhancedReturnType) as D
     }
 
@@ -65,7 +65,7 @@ private fun <D : CallableMemberDescriptor> D.parts(isCovariant: Boolean, collect
     return SignatureParts(
             collector(this),
             this.getOverriddenDescriptors().map {
-                @suppress("UNCHECKED_CAST")
+                @Suppress("UNCHECKED_CAST")
                 collector(it as D)
             },
             isCovariant

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt

@@ -16,22 +16,24 @@
 
 package org.jetbrains.kotlin.load.kotlin
 
-import kotlin.platform.platformStatic
 import org.jetbrains.kotlin.name.Name
 
 // The purpose of this class is to hold a unique signature of either a method or a field, so that annotations on a member can be put
 // into a map indexed by these signatures
 data class MemberSignature private constructor(private val signature: String) {
     companion object {
-        platformStatic public fun fromMethodNameAndDesc(nameAndDesc: String): MemberSignature {
+        @JvmStatic
+        public fun fromMethodNameAndDesc(nameAndDesc: String): MemberSignature {
             return MemberSignature(nameAndDesc)
         }
 
-        platformStatic public fun fromFieldNameAndDesc(name: Name, desc: String): MemberSignature {
+        @JvmStatic
+        public fun fromFieldNameAndDesc(name: Name, desc: String): MemberSignature {
             return MemberSignature(name.asString() + "#" + desc)
         }
 
-        platformStatic public fun fromMethodSignatureAndParameterIndex(signature: MemberSignature, index: Int): MemberSignature {
+        @JvmStatic
+        public fun fromMethodSignatureAndParameterIndex(signature: MemberSignature, index: Int): MemberSignature {
             return MemberSignature(signature.signature + "@" + index)
         }
     }

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt

@@ -81,7 +81,8 @@ public class PackageParts(val packageFqName: String) {
             packageFqName.hashCode() * 31 + parts.hashCode()
 
     companion object {
-        @jvmStatic public fun PackageParts.serialize(builder: JvmPackageTable.PackageTable.Builder) {
+        @JvmStatic
+        public fun PackageParts.serialize(builder: JvmPackageTable.PackageTable.Builder) {
             if (this.parts.isNotEmpty()) {
                 val packageParts = JvmPackageTable.PackageParts.newBuilder()
                 packageParts.setPackageFqName(this.packageFqName)

core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt

@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.serialization.jvm
 import com.google.protobuf.ExtensionRegistryLite
 import org.jetbrains.kotlin.serialization.ClassData
 import org.jetbrains.kotlin.serialization.PackageData
-import kotlin.platform.platformStatic
 
 public object JvmProtoBufUtil {
     public val EXTENSION_REGISTRY: ExtensionRegistryLite = run {
@@ -28,15 +27,15 @@ public object JvmProtoBufUtil {
         registry
     }
 
-    platformStatic
+    @JvmStatic
     public fun readClassDataFrom(encodedData: Array<String>): ClassData = readClassDataFrom(BitEncoding.decodeBytes(encodedData))
 
-    platformStatic
+    @JvmStatic
     public fun readClassDataFrom(data: ByteArray): ClassData = ClassData.read(data, EXTENSION_REGISTRY)
 
-    platformStatic
+    @JvmStatic
     public fun readPackageDataFrom(encodedData: Array<String>): PackageData = readPackageDataFrom(BitEncoding.decodeBytes(encodedData))
 
-    platformStatic
+    @JvmStatic
     public fun readPackageDataFrom(data: ByteArray): PackageData = PackageData.read(data, EXTENSION_REGISTRY)
 }