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
+5 -7
View File
@@ -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")
}
}
+5 -8
View File
@@ -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
@platformName("main0")
@JvmStatic
@JvmName("main0")
fun main(args: Array<String>) { // no
}
}
@@ -31,8 +28,8 @@ class C {
class D {
companion object {
@platformStatic
@platformName("main")
@JvmStatic
@JvmName("main")
fun badName(args: Array<String>) { // yes
}
}
@@ -1,8 +1,6 @@
package pkg2
import kotlin.platform.platformName
@platformName("aa")
@JvmName("aa")
fun main(args: Array<String>) {
// no
}
@@ -1,8 +1,6 @@
package pkg3
import kotlin.platform.platformName
@platformName("main")
@JvmName("main")
fun aaa(args: Array<String>) {
// yes
}
+1 -3
View File
@@ -1,8 +1,6 @@
package renameTest
import kotlin.platform.platformStatic
object Foo {
@platformStatic fun main(args: Array<String>) {
@JvmStatic fun main(args: Array<String>) {
}
}
@@ -1,8 +1,6 @@
package renameTest
import kotlin.platform.platformStatic
object Foo {
@platformStatic fun main(args: Array<String>) {
@JvmStatic fun main(args: Array<String>) {
}
}