drop deprecated @platformName and @platformStatic annotations

This commit is contained in:
Dmitry Jemerov
2015-10-29 14:29:53 +01:00
parent 15370244dc
commit 736b496f6a
74 changed files with 139 additions and 274 deletions
@@ -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() {
}
}
}
@@ -2,7 +2,7 @@ package companionObjectWithStatics
class Foo {
companion object {
platformStatic fun foo() {
@JvmStatic fun foo() {
}
val CONST = 111
@@ -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>) {
}
}
@@ -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
}
}