jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-05-17 15:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename platformStatic to jvmStatic

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-08-21 12:57:54 +02:00
parent 4053c19260
commit 341f09afd3
51 changed files with 145 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/testData/codegen/boxWithJava/platformStatic/annotations/simpleClassObject.kt vendored
View File

@@ -1,4 +1,4 @@
import kotlin.platform.platformStatic
import kotlin.jvm.jvmStatic
annotation(retention = AnnotationRetention.RUNTIME) class testAnnotation
@@ -7,14 +7,14 @@ class A {
companion object {
val b: String = "OK"
platformStatic testAnnotation fun test1() = b
jvmStatic testAnnotation fun test1() = b
}
}
object B {
val b: String = "OK"
platformStatic testAnnotation fun test1() = b
jvmStatic testAnnotation fun test1() = b
}
fun box(): String {

10
compiler/testData/codegen/boxWithJava/platformStatic/classObject/simpleClassObject.kt vendored
View File

@@ -1,17 +1,17 @@
import kotlin.platform.platformStatic
import kotlin.jvm.jvmStatic
class A {
companion object {
val b: String = "OK"
platformStatic val c: String = "OK"
jvmStatic val c: String = "OK"
platformStatic fun test1() = b
jvmStatic fun test1() = b
platformStatic fun test2() = b
jvmStatic fun test2() = b
platformStatic fun String.test3() = this + b
jvmStatic fun String.test3() = this + b
}
}

6
compiler/testData/codegen/boxWithJava/platformStatic/enumCompanion/enumCompanionObject.kt vendored
View File

@@ -1,13 +1,13 @@
import kotlin.platform.platformStatic
import kotlin.jvm.jvmStatic
enum class A {
;
companion object {
val foo: String = "OK"
platformStatic val bar: String = "OK"
jvmStatic val bar: String = "OK"
platformStatic fun baz() = foo
jvmStatic fun baz() = foo
}
}

10
compiler/testData/codegen/boxWithJava/platformStatic/object/simpleObject.kt vendored
View File

@@ -1,16 +1,16 @@
import kotlin.platform.platformStatic
import kotlin.jvm.jvmStatic
object A {
val b: String = "OK"
platformStatic val c: String = "OK"
jvmStatic val c: String = "OK"
platformStatic fun test1() = b
jvmStatic fun test1() = b
platformStatic fun test2() = b
jvmStatic fun test2() = b
platformStatic fun String.test3() = this + b
jvmStatic fun String.test3() = this + b
}
fun box(): String {