Skip to content

Commit 865c53a

Browse files
committed
Dev: update Kotlin to version 1.5.10
1 parent 4bb9d6d commit 865c53a

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.4.31'
2+
ext.kotlin_version = '1.5.10'
33

44
repositories {
55
google()

sample/src/androidTest/java/com/readdle/swiftjava/sample/SampleValueTest.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
44
import com.readdle.codegen.anotation.JavaSwift
55
import com.readdle.codegen.anotation.SwiftError
66
import com.readdle.swiftjava.sample.SampleValue.Companion.funcThrows
7-
import com.readdle.swiftjava.sample.SampleValue.Companion.randomValue
87
import org.junit.Assert
98
import org.junit.Before
109
import org.junit.Test
@@ -21,7 +20,7 @@ class SampleValueTest {
2120

2221
@Test
2322
fun testGetRandomValue() {
24-
val sampleValue = randomValue.copy()
23+
val sampleValue = SampleValue.getRandomValue().copy()
2524
Assert.assertNotNull(sampleValue)
2625
Assert.assertTrue(sampleValue.string.isNotEmpty())
2726
Assert.assertTrue(sampleValue.integer == 32)
@@ -51,15 +50,15 @@ class SampleValueTest {
5150

5251
@Test
5352
fun testSaveValue() {
54-
val sampleValue = randomValue
53+
val sampleValue = SampleValue.getRandomValue()
5554
sampleValue.string = UUID.randomUUID().toString()
5655
sampleValue.saveValue()
5756
}
5857

5958
@Test
6059
fun testIsSame() {
61-
val otherValue = randomValue
62-
val sampleValue = randomValue
60+
val otherValue = SampleValue.getRandomValue()
61+
val sampleValue = SampleValue.getRandomValue()
6362
sampleValue.string = otherValue.string
6463
Assert.assertTrue(sampleValue.isSame(otherValue))
6564
}

sample/src/main/java/com/readdle/swiftjava/sample/SampleReference.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@ class SampleReference private constructor() {
108108
external fun oneMoreReferenceTableOverflow(delegate: SampleDelegateAndroid)
109109

110110
companion object {
111+
111112
@JvmStatic
112113
external fun init(): SampleReference
113114

114-
@JvmStatic
115-
@get:SwiftGetter("staticString")
116-
@set:SwiftSetter("staticString")
117-
var staticString: String
118-
external get
119-
external set
115+
@JvmStatic @SwiftGetter("staticString")
116+
external fun getStaticString(): String
117+
118+
@JvmStatic @SwiftSetter("staticString")
119+
external fun setStaticString(value: String)
120120

121121
}
122122
}

sample/src/main/java/com/readdle/swiftjava/sample/SampleValue.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,10 @@ open class SampleValue protected constructor() {
109109

110110

111111
companion object {
112+
112113
@JvmStatic
113-
val randomValue: SampleValue external get
114+
external fun getRandomValue(): SampleValue
115+
114116
@JvmStatic
115117
@Throws(SwiftError::class)
116118
external fun funcThrows()

sample/src/main/swift/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)