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,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
}
}
@@ -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.platform.platformStatic() public final fun test2(): kotlin.Unit
@kotlin.jvm.JvmStatic() public final fun test1(): 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
}
}
@@ -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"
@platformStatic set(t: String) {}
@JvmStatic get() = "OK"
@JvmStatic set(t: String) {}
}
}
@@ -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
}
}
@@ -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
}
}
@@ -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.platform.platformStatic() public final fun test2(): kotlin.Unit
@kotlin.jvm.JvmStatic() public final fun test1(): 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 {
@@ -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"
@platformStatic set(t: String) {}
@JvmStatic get() = "OK"
@JvmStatic set(t: String) {}
}
@@ -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
}