Skip to content

Commit 245030b

Browse files
authored
Update to Kotlin 1.9.0: (#2364)
- Apply @ExperimentalNativeApi on WeakReference usages - Drop Legacy JS compiler as it is deprecated - Update API Dump with .entries enum properties - Update yarn.lock
1 parent e41097e commit 245030b

File tree

49 files changed

+155
-1063
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+155
-1063
lines changed

core/api/kotlinx-serialization-core.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public abstract interface annotation class kotlinx/serialization/EncodeDefault :
2626
public final class kotlinx/serialization/EncodeDefault$Mode : java/lang/Enum {
2727
public static final field ALWAYS Lkotlinx/serialization/EncodeDefault$Mode;
2828
public static final field NEVER Lkotlinx/serialization/EncodeDefault$Mode;
29+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
2930
public static fun valueOf (Ljava/lang/String;)Lkotlinx/serialization/EncodeDefault$Mode;
3031
public static fun values ()[Lkotlinx/serialization/EncodeDefault$Mode;
3132
}

core/build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,4 @@ tasks.withType(Jar).named(kotlin.jvm().artifactsTaskName) {
6565
}
6666
}
6767

68-
tasks.withType(Kotlin2JsCompile.class).configureEach {
69-
if (it.name == "compileTestKotlinJsLegacy") {
70-
it.exclude("**/SerializersModuleTest.kt")
71-
}
72-
}
73-
7468
Java9Modularity.configureJava9ModuleInfo(project)

core/commonTest/src/kotlinx/serialization/CachedSerializersTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,27 +38,27 @@ class CachedSerializersTest {
3838
}
3939

4040
@Test
41-
fun testObjectSerializersAreSame() = noJsLegacy {
41+
fun testObjectSerializersAreSame() {
4242
assertSame(Object.serializer(), Object.serializer())
4343
}
4444

4545
@Test
46-
fun testSerializableEnumSerializersAreSame() = noJsLegacy {
46+
fun testSerializableEnumSerializersAreSame() {
4747
assertSame(SerializableEnum.serializer(), SerializableEnum.serializer())
4848
}
4949

5050
@Test
51-
fun testSerializableMarkedEnumSerializersAreSame() = noJsLegacy {
51+
fun testSerializableMarkedEnumSerializersAreSame() {
5252
assertSame(SerializableMarkedEnum.serializer(), SerializableMarkedEnum.serializer())
5353
}
5454

5555
@Test
56-
fun testSealedSerializersAreSame() = noJsLegacy {
56+
fun testSealedSerializersAreSame() {
5757
assertSame(SealedParent.serializer(), SealedParent.serializer())
5858
}
5959

6060
@Test
61-
fun testAbstractSerializersAreSame() = noJsLegacy {
61+
fun testAbstractSerializersAreSame() {
6262
assertSame(Abstract.serializer(), Abstract.serializer())
6363
}
6464

core/commonTest/src/kotlinx/serialization/InheritableSerialInfoTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package kotlinx.serialization
22

33
import kotlinx.serialization.descriptors.SerialDescriptor
4-
import kotlinx.serialization.test.isJsLegacy
54
import kotlin.test.*
65

76

@@ -33,7 +32,6 @@ class InheritableSerialInfoTest {
3332
class E3: A, B
3433

3534
private fun doTest(descriptor: SerialDescriptor) {
36-
if (isJsLegacy()) return // Unsupported
3735
val list = descriptor.annotations.filterIsInstance<InheritableDiscriminator>()
3836
assertEquals(1, list.size)
3937
assertEquals("a", list.first().discriminator)

core/commonTest/src/kotlinx/serialization/MetaSerializableTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,20 @@ class MetaSerializableTest {
3434
)
3535

3636
@Test
37-
fun testMetaSerializable() = noJsLegacy {
37+
fun testMetaSerializable() {
3838
val serializer = serializer<Project1>()
3939
assertNotNull(serializer)
4040
}
4141

4242
@Test
43-
fun testMetaSerializableWithInfo() = noJsLegacy {
43+
fun testMetaSerializableWithInfo() {
4444
val info = serializer<Project2>().descriptor.annotations.filterIsInstance<MySerializableWithInfo>().first()
4545
assertEquals(123, info.value)
4646
assertEquals(String::class, info.kclass)
4747
}
4848

4949
@Test
50-
fun testMetaSerializableOnProperty() = noJsLegacy {
50+
fun testMetaSerializableOnProperty() {
5151
val info = serializer<Wrapper>().descriptor
5252
.getElementAnnotations(0).filterIsInstance<MySerializableWithInfo>().first()
5353
assertEquals(234, info.value)

core/commonTest/src/kotlinx/serialization/SerialDescriptorAnnotationsTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
package kotlinx.serialization
66

77
import kotlinx.serialization.descriptors.*
8-
import kotlinx.serialization.test.isJsLegacy
98
import kotlin.test.*
109

1110
class SerialDescriptorAnnotationsTest {
@@ -103,7 +102,6 @@ class SerialDescriptorAnnotationsTest {
103102
class Holder(val r: Result, val a: AbstractResult, val o: ObjectResult, @Contextual val names: WithNames)
104103

105104
private fun doTest(position: Int, expected: String) {
106-
if (isJsLegacy()) return // Unsupported
107105
val desc = Holder.serializer().descriptor.getElementDescriptor(position)
108106
assertEquals(expected, desc.annotations.getCustom())
109107
}

core/commonTest/src/kotlinx/serialization/SerializersLookupEnumTest.kt

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@ class SerializersLookupEnumTest {
5454

5555
@Test
5656
fun testPlainEnum() {
57-
if (isJsLegacy()) {
58-
assertSame(PlainEnum.serializer()::class, serializer<PlainEnum>()::class)
59-
} else {
60-
assertSame(PlainEnum.serializer(), serializer<PlainEnum>())
61-
}
57+
assertSame(PlainEnum.serializer(), serializer<PlainEnum>())
6258

6359
if (!isJs()) {
6460
assertIs<EnumSerializer<PlainEnum>>(serializer<PlainEnum>())
@@ -69,22 +65,14 @@ class SerializersLookupEnumTest {
6965
fun testSerializableEnumSerializer() {
7066
assertIs<EnumSerializer<SerializableEnum>>(SerializableEnum.serializer())
7167

72-
if (isJsLegacy()) {
73-
assertSame(SerializableEnum.serializer()::class, serializer<SerializableEnum>()::class)
74-
} else {
75-
assertSame(SerializableEnum.serializer(), serializer<SerializableEnum>())
76-
}
68+
assertSame(SerializableEnum.serializer(), serializer<SerializableEnum>())
7769
}
7870

7971
@Test
8072
fun testSerializableMarkedEnumSerializer() {
8173
assertIs<EnumSerializer<SerializableMarkedEnum>>(SerializableMarkedEnum.serializer())
8274

83-
if (isJsLegacy()) {
84-
assertSame(SerializableMarkedEnum.serializer()::class, serializer<SerializableMarkedEnum>()::class)
85-
} else {
86-
assertSame(SerializableMarkedEnum.serializer(), serializer<SerializableMarkedEnum>())
87-
}
75+
assertSame(SerializableMarkedEnum.serializer(), serializer<SerializableMarkedEnum>())
8876
}
8977

9078
@Test

core/commonTest/src/kotlinx/serialization/SerializersLookupInterfaceTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class SerializersLookupInterfaceTest {
2626

2727
@Test
2828
fun testSealedInterfaceLookup() {
29-
if (currentPlatform == Platform.JS_LEGACY) return
3029
val serializer = serializer<S>()
3130
assertTrue(serializer is SealedClassSerializer)
3231
assertEquals("S", serializer.descriptor.serialName)
@@ -35,7 +34,7 @@ class SerializersLookupInterfaceTest {
3534
@Test
3635
fun testInterfaceLookup() {
3736
// Native does not have KClass.isInterface
38-
if (currentPlatform == Platform.NATIVE || currentPlatform == Platform.JS_LEGACY) return
37+
if (isNative()) return
3938

4039
val serializer1 = serializer<I>()
4140
assertTrue(serializer1 is PolymorphicSerializer)

core/commonTest/src/kotlinx/serialization/SerializersLookupObjectTest.kt

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,26 +46,19 @@ class SerializersLookupObjectTest {
4646

4747
@Test
4848
fun testPlainObject() {
49-
if (!isJsLegacy()) {
50-
assertSame(PlainObject.serializer(), serializer<PlainObject>())
51-
}
49+
assertSame(PlainObject.serializer(), serializer<PlainObject>())
5250
}
5351

5452

5553
@Test
5654
fun testObjectExternalObject() {
5755
assertSame(ObjectCustomObjectSerializer, ObjectExternalObject.serializer())
58-
if (!isJsLegacy()) {
59-
assertSame(ObjectCustomObjectSerializer, serializer<ObjectExternalObject>())
60-
}
56+
assertSame(ObjectCustomObjectSerializer, serializer<ObjectExternalObject>())
6157
}
6258

6359
@Test
6460
fun testObjectExternalClass() {
6561
assertIs<ObjectCustomClassSerializer>(ObjectExternalClass.serializer())
66-
67-
if (!isJsLegacy()) {
68-
assertIs<ObjectCustomClassSerializer>(serializer<ObjectExternalClass>())
69-
}
62+
assertIs<ObjectCustomClassSerializer>(serializer<ObjectExternalClass>())
7063
}
7164
}

core/commonTest/src/kotlinx/serialization/SerializersModuleTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class SerializersModuleTest {
4949
class ContextualHolder(@Contextual val contextual: ContextualType)
5050

5151
@Test
52-
fun testCompiled() = noJsLegacy {
52+
fun testCompiled() {
5353
assertSame<KSerializer<*>>(Object.serializer(), serializer(Object::class, emptyList(), false))
5454
assertSame<KSerializer<*>>(SealedParent.serializer(), serializer(SealedParent::class, emptyList(), false))
5555
assertSame<KSerializer<*>>(

0 commit comments

Comments
 (0)