diff --git a/libraries/tools/kotlin-main-kts-test/testData/hello-kotlinx-serialization.main.kts b/libraries/tools/kotlin-main-kts-test/testData/hello-kotlinx-serialization.main.kts index 2125911a54d..d85da7db24c 100644 --- a/libraries/tools/kotlin-main-kts-test/testData/hello-kotlinx-serialization.main.kts +++ b/libraries/tools/kotlin-main-kts-test/testData/hello-kotlinx-serialization.main.kts @@ -1,6 +1,6 @@ @file:Repository("https://jcenter.bintray.com/") -@file:DependsOn("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0-1.4.0-rc-95", options = ["transitive=false"]) +@file:DependsOn("org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc", options = ["transitive=false"]) import kotlinx.serialization.* import kotlinx.serialization.json.* @@ -8,11 +8,9 @@ import kotlinx.serialization.json.* @Serializable data class User(val firstName: String, val lastName: String) -val json = Json(JsonConfiguration.Stable) - -val jsonData = json.encodeToString(User.serializer(), User("James", "Bond")) +val jsonData = Json.encodeToString(User.serializer(), User("James", "Bond")) println(jsonData) -val obj = json.decodeFromString(User.serializer(), """{"firstName":"James", "lastName":"Bond"}""") +val obj = Json.decodeFromString(User.serializer(), """{"firstName":"James", "lastName":"Bond"}""") println(obj) diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts index 2a81fbf64b0..30b6587b6e6 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) - testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-jvm:0.20.0-1.4.0-rc-95") { isTransitive = false } + testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-jvm:1.0-M1-1.4.0-rc") { isTransitive = false } testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/RuntimeSearch.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/RuntimeSearch.kt index d6ad9ff8a14..3f97a5fdb29 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/RuntimeSearch.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/test/org/jetbrains/kotlinx/serialization/RuntimeSearch.kt @@ -27,8 +27,7 @@ class RuntimeLibraryInClasspathTest { fun testRuntimeHasSufficientVersion() { val version = VersionReader.getVersionsFromManifest(runtimeLibraryPath!!) assertTrue(version.currentCompilerMatchRequired(), "Runtime version too high") - // todo: uncomment this when corresponding runtime version would be published -// assertTrue(version.implementationVersionMatchSupported(), "Runtime version too low") + assertTrue(version.implementationVersionMatchSupported(), "Runtime version too low") } } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.ir.txt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.ir.txt index 8913097405f..19dc50f7fa1 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.ir.txt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.ir.txt @@ -1,7 +1,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serialization/internal/GeneratedSerializer { public final static ListOfUsers$$serializer INSTANCE - public final static kotlinx.serialization.SerialDescriptor descriptor + public final static kotlinx.serialization.descriptors.SerialDescriptor descriptor static void () { NEW @@ -24,7 +24,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V) ALOAD (0) CHECKCAST - PUTSTATIC (descriptor, Lkotlinx/serialization/SerialDescriptor;) + PUTSTATIC (descriptor, Lkotlinx/serialization/descriptors/SerialDescriptor;) LABEL (L1) LINENUMBER (13) RETURN @@ -59,7 +59,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa LABEL (L1) } - public ListOfUsers deserialize(kotlinx.serialization.Decoder decoder) { + public ListOfUsers deserialize(kotlinx.serialization.encoding.Decoder decoder) { LABEL (L0) ALOAD (1) LDC (decoder) @@ -67,7 +67,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa LABEL (L1) LINENUMBER (12) ALOAD (0) - INVOKEVIRTUAL (ListOfUsers$$serializer, getDescriptor, ()Lkotlinx/serialization/SerialDescriptor;) + INVOKEVIRTUAL (ListOfUsers$$serializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;) ASTORE (2) ICONST_1 ISTORE (3) @@ -79,10 +79,10 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa ASTORE (6) ALOAD (1) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/Decoder, beginStructure, (Lkotlinx/serialization/SerialDescriptor;)Lkotlinx/serialization/CompositeDecoder;) + INVOKEINTERFACE (kotlinx/serialization/encoding/Decoder, beginStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeDecoder;) ASTORE (7) ALOAD (7) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeSequentially, ()Z) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSequentially, ()Z) IFEQ (L2) ALOAD (7) ALOAD (2) @@ -94,7 +94,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa INVOKESPECIAL (kotlinx/serialization/internal/ArrayListSerializer, , (Lkotlinx/serialization/KSerializer;)V) CHECKCAST ALOAD (6) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;) ASTORE (6) ILOAD (5) ICONST_1 @@ -106,7 +106,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa IFEQ (L3) ALOAD (7) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeElementIndex, (Lkotlinx/serialization/SerialDescriptor;)I) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeElementIndex, (Lkotlinx/serialization/descriptors/SerialDescriptor;)I) ISTORE (4) ILOAD (4) TABLESWITCH @@ -125,7 +125,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa INVOKESPECIAL (kotlinx/serialization/internal/ArrayListSerializer, , (Lkotlinx/serialization/KSerializer;)V) CHECKCAST ALOAD (6) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;) ASTORE (6) ILOAD (5) ICONST_1 @@ -146,7 +146,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa ALOAD (2) LABEL (L8) LINENUMBER (12) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, endStructure, (Lkotlinx/serialization/SerialDescriptor;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, endStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)V) NEW DUP ILOAD (5) @@ -159,22 +159,22 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa LABEL (L9) } - public java.lang.Object deserialize(kotlinx.serialization.Decoder decoder) { + public java.lang.Object deserialize(kotlinx.serialization.encoding.Decoder decoder) { LABEL (L0) ALOAD (0) ALOAD (1) - INVOKEVIRTUAL (ListOfUsers$$serializer, deserialize, (Lkotlinx/serialization/Decoder;)LListOfUsers;) + INVOKEVIRTUAL (ListOfUsers$$serializer, deserialize, (Lkotlinx/serialization/encoding/Decoder;)LListOfUsers;) ARETURN LABEL (L1) } - public kotlinx.serialization.SerialDescriptor getDescriptor() + public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor() - public ListOfUsers patch(kotlinx.serialization.Decoder decoder, ListOfUsers old) + public ListOfUsers patch(kotlinx.serialization.encoding.Decoder decoder, ListOfUsers old) - public java.lang.Object patch(kotlinx.serialization.Decoder decoder, java.lang.Object old) + public java.lang.Object patch(kotlinx.serialization.encoding.Decoder decoder, java.lang.Object old) - public void serialize(kotlinx.serialization.Encoder encoder, ListOfUsers value) { + public void serialize(kotlinx.serialization.encoding.Encoder encoder, ListOfUsers value) { LABEL (L0) ALOAD (1) LDC (encoder) @@ -185,11 +185,11 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa LABEL (L1) LINENUMBER (12) ALOAD (0) - INVOKEVIRTUAL (ListOfUsers$$serializer, getDescriptor, ()Lkotlinx/serialization/SerialDescriptor;) + INVOKEVIRTUAL (ListOfUsers$$serializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;) ASTORE (3) ALOAD (1) ALOAD (3) - INVOKEINTERFACE (kotlinx/serialization/Encoder, beginStructure, (Lkotlinx/serialization/SerialDescriptor;)Lkotlinx/serialization/CompositeEncoder;) + INVOKEINTERFACE (kotlinx/serialization/encoding/Encoder, beginStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeEncoder;) ASTORE (4) ALOAD (4) ALOAD (3) @@ -202,21 +202,21 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa CHECKCAST ALOAD (2) INVOKEVIRTUAL (ListOfUsers, getList, ()Ljava/util/List;) - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, encodeSerializableElement, (Lkotlinx/serialization/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V) ALOAD (4) ALOAD (3) - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, endStructure, (Lkotlinx/serialization/SerialDescriptor;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, endStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)V) RETURN LABEL (L2) } - public void serialize(kotlinx.serialization.Encoder encoder, java.lang.Object value) { + public void serialize(kotlinx.serialization.encoding.Encoder encoder, java.lang.Object value) { LABEL (L0) ALOAD (0) ALOAD (1) ALOAD (2) CHECKCAST - INVOKEVIRTUAL (ListOfUsers$$serializer, serialize, (Lkotlinx/serialization/Encoder;LListOfUsers;)V) + INVOKEVIRTUAL (ListOfUsers$$serializer, serialize, (Lkotlinx/serialization/encoding/Encoder;LListOfUsers;)V) RETURN LABEL (L1) } @@ -307,7 +307,7 @@ public final class ListOfUsers : java/lang/Object { public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serialization/internal/GeneratedSerializer { public final static OptionalUser$$serializer INSTANCE - public final static kotlinx.serialization.SerialDescriptor descriptor + public final static kotlinx.serialization.descriptors.SerialDescriptor descriptor static void () { NEW @@ -330,7 +330,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V) ALOAD (0) CHECKCAST - PUTSTATIC (descriptor, Lkotlinx/serialization/SerialDescriptor;) + PUTSTATIC (descriptor, Lkotlinx/serialization/descriptors/SerialDescriptor;) LABEL (L1) LINENUMBER (10) RETURN @@ -361,7 +361,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ LABEL (L1) } - public OptionalUser deserialize(kotlinx.serialization.Decoder decoder) { + public OptionalUser deserialize(kotlinx.serialization.encoding.Decoder decoder) { LABEL (L0) ALOAD (1) LDC (decoder) @@ -369,7 +369,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ LABEL (L1) LINENUMBER (9) ALOAD (0) - INVOKEVIRTUAL (OptionalUser$$serializer, getDescriptor, ()Lkotlinx/serialization/SerialDescriptor;) + INVOKEVIRTUAL (OptionalUser$$serializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;) ASTORE (2) ICONST_1 ISTORE (3) @@ -381,10 +381,10 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ ASTORE (6) ALOAD (1) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/Decoder, beginStructure, (Lkotlinx/serialization/SerialDescriptor;)Lkotlinx/serialization/CompositeDecoder;) + INVOKEINTERFACE (kotlinx/serialization/encoding/Decoder, beginStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeDecoder;) ASTORE (7) ALOAD (7) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeSequentially, ()Z) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSequentially, ()Z) IFEQ (L2) ALOAD (7) ALOAD (2) @@ -392,7 +392,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ GETSTATIC (INSTANCE, LUser$$serializer;) CHECKCAST ALOAD (6) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;) ASTORE (6) ILOAD (5) ICONST_1 @@ -404,7 +404,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ IFEQ (L3) ALOAD (7) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeElementIndex, (Lkotlinx/serialization/SerialDescriptor;)I) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeElementIndex, (Lkotlinx/serialization/descriptors/SerialDescriptor;)I) ISTORE (4) ILOAD (4) TABLESWITCH @@ -419,7 +419,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ GETSTATIC (INSTANCE, LUser$$serializer;) CHECKCAST ALOAD (6) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;) ASTORE (6) ILOAD (5) ICONST_1 @@ -440,7 +440,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ ALOAD (2) LABEL (L8) LINENUMBER (9) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, endStructure, (Lkotlinx/serialization/SerialDescriptor;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, endStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)V) NEW DUP ILOAD (5) @@ -453,22 +453,22 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ LABEL (L9) } - public java.lang.Object deserialize(kotlinx.serialization.Decoder decoder) { + public java.lang.Object deserialize(kotlinx.serialization.encoding.Decoder decoder) { LABEL (L0) ALOAD (0) ALOAD (1) - INVOKEVIRTUAL (OptionalUser$$serializer, deserialize, (Lkotlinx/serialization/Decoder;)LOptionalUser;) + INVOKEVIRTUAL (OptionalUser$$serializer, deserialize, (Lkotlinx/serialization/encoding/Decoder;)LOptionalUser;) ARETURN LABEL (L1) } - public kotlinx.serialization.SerialDescriptor getDescriptor() + public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor() - public OptionalUser patch(kotlinx.serialization.Decoder decoder, OptionalUser old) + public OptionalUser patch(kotlinx.serialization.encoding.Decoder decoder, OptionalUser old) - public java.lang.Object patch(kotlinx.serialization.Decoder decoder, java.lang.Object old) + public java.lang.Object patch(kotlinx.serialization.encoding.Decoder decoder, java.lang.Object old) - public void serialize(kotlinx.serialization.Encoder encoder, OptionalUser value) { + public void serialize(kotlinx.serialization.encoding.Encoder encoder, OptionalUser value) { LABEL (L0) ALOAD (1) LDC (encoder) @@ -479,11 +479,11 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ LABEL (L1) LINENUMBER (9) ALOAD (0) - INVOKEVIRTUAL (OptionalUser$$serializer, getDescriptor, ()Lkotlinx/serialization/SerialDescriptor;) + INVOKEVIRTUAL (OptionalUser$$serializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;) ASTORE (3) ALOAD (1) ALOAD (3) - INVOKEINTERFACE (kotlinx/serialization/Encoder, beginStructure, (Lkotlinx/serialization/SerialDescriptor;)Lkotlinx/serialization/CompositeEncoder;) + INVOKEINTERFACE (kotlinx/serialization/encoding/Encoder, beginStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeEncoder;) ASTORE (4) ALOAD (2) INVOKEVIRTUAL (OptionalUser, getUser, ()LUser;) @@ -504,7 +504,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ ALOAD (4) ALOAD (3) ICONST_0 - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, shouldEncodeElementDefault, (Lkotlinx/serialization/SerialDescriptor;I)Z) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, shouldEncodeElementDefault, (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Z) LABEL (L5) IFEQ (L6) ALOAD (4) @@ -514,22 +514,22 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ CHECKCAST ALOAD (2) INVOKEVIRTUAL (OptionalUser, getUser, ()LUser;) - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, encodeSerializableElement, (Lkotlinx/serialization/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V) LABEL (L6) ALOAD (4) ALOAD (3) - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, endStructure, (Lkotlinx/serialization/SerialDescriptor;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, endStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)V) RETURN LABEL (L7) } - public void serialize(kotlinx.serialization.Encoder encoder, java.lang.Object value) { + public void serialize(kotlinx.serialization.encoding.Encoder encoder, java.lang.Object value) { LABEL (L0) ALOAD (0) ALOAD (1) ALOAD (2) CHECKCAST - INVOKEVIRTUAL (OptionalUser$$serializer, serialize, (Lkotlinx/serialization/Encoder;LOptionalUser;)V) + INVOKEVIRTUAL (OptionalUser$$serializer, serialize, (Lkotlinx/serialization/encoding/Encoder;LOptionalUser;)V) RETURN LABEL (L1) } @@ -658,7 +658,7 @@ public final class OptionalUser : java/lang/Object { public final class User$$serializer : java/lang/Object, kotlinx/serialization/internal/GeneratedSerializer { public final static User$$serializer INSTANCE - public final static kotlinx.serialization.SerialDescriptor descriptor + public final static kotlinx.serialization.descriptors.SerialDescriptor descriptor static void () { NEW @@ -685,7 +685,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V) ALOAD (0) CHECKCAST - PUTSTATIC (descriptor, Lkotlinx/serialization/SerialDescriptor;) + PUTSTATIC (descriptor, Lkotlinx/serialization/descriptors/SerialDescriptor;) LABEL (L1) LINENUMBER (7) RETURN @@ -721,7 +721,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in LABEL (L1) } - public User deserialize(kotlinx.serialization.Decoder decoder) { + public User deserialize(kotlinx.serialization.encoding.Decoder decoder) { LABEL (L0) ALOAD (1) LDC (decoder) @@ -729,7 +729,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in LABEL (L1) LINENUMBER (6) ALOAD (0) - INVOKEVIRTUAL (User$$serializer, getDescriptor, ()Lkotlinx/serialization/SerialDescriptor;) + INVOKEVIRTUAL (User$$serializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;) ASTORE (2) ICONST_1 ISTORE (3) @@ -743,15 +743,15 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in ASTORE (7) ALOAD (1) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/Decoder, beginStructure, (Lkotlinx/serialization/SerialDescriptor;)Lkotlinx/serialization/CompositeDecoder;) + INVOKEINTERFACE (kotlinx/serialization/encoding/Decoder, beginStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeDecoder;) ASTORE (8) ALOAD (8) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeSequentially, ()Z) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSequentially, ()Z) IFEQ (L2) ALOAD (8) ALOAD (2) ICONST_0 - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/SerialDescriptor;I)Ljava/lang/String;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Ljava/lang/String;) ASTORE (6) ILOAD (5) ICONST_1 @@ -760,7 +760,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in ALOAD (8) ALOAD (2) ICONST_1 - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/SerialDescriptor;I)Ljava/lang/String;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Ljava/lang/String;) ASTORE (7) ILOAD (5) ICONST_2 @@ -772,7 +772,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in IFEQ (L3) ALOAD (8) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeElementIndex, (Lkotlinx/serialization/SerialDescriptor;)I) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeElementIndex, (Lkotlinx/serialization/descriptors/SerialDescriptor;)I) ISTORE (4) ILOAD (4) TABLESWITCH @@ -784,7 +784,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in ALOAD (8) ALOAD (2) ICONST_0 - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/SerialDescriptor;I)Ljava/lang/String;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Ljava/lang/String;) ASTORE (6) ILOAD (5) ICONST_1 @@ -795,7 +795,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in ALOAD (8) ALOAD (2) ICONST_1 - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/SerialDescriptor;I)Ljava/lang/String;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Ljava/lang/String;) ASTORE (7) ILOAD (5) ICONST_2 @@ -816,7 +816,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in ALOAD (2) LABEL (L9) LINENUMBER (6) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, endStructure, (Lkotlinx/serialization/SerialDescriptor;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, endStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)V) NEW DUP ILOAD (5) @@ -829,22 +829,22 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in LABEL (L10) } - public java.lang.Object deserialize(kotlinx.serialization.Decoder decoder) { + public java.lang.Object deserialize(kotlinx.serialization.encoding.Decoder decoder) { LABEL (L0) ALOAD (0) ALOAD (1) - INVOKEVIRTUAL (User$$serializer, deserialize, (Lkotlinx/serialization/Decoder;)LUser;) + INVOKEVIRTUAL (User$$serializer, deserialize, (Lkotlinx/serialization/encoding/Decoder;)LUser;) ARETURN LABEL (L1) } - public kotlinx.serialization.SerialDescriptor getDescriptor() + public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor() - public User patch(kotlinx.serialization.Decoder decoder, User old) + public User patch(kotlinx.serialization.encoding.Decoder decoder, User old) - public java.lang.Object patch(kotlinx.serialization.Decoder decoder, java.lang.Object old) + public java.lang.Object patch(kotlinx.serialization.encoding.Decoder decoder, java.lang.Object old) - public void serialize(kotlinx.serialization.Encoder encoder, User value) { + public void serialize(kotlinx.serialization.encoding.Encoder encoder, User value) { LABEL (L0) ALOAD (1) LDC (encoder) @@ -855,38 +855,38 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in LABEL (L1) LINENUMBER (6) ALOAD (0) - INVOKEVIRTUAL (User$$serializer, getDescriptor, ()Lkotlinx/serialization/SerialDescriptor;) + INVOKEVIRTUAL (User$$serializer, getDescriptor, ()Lkotlinx/serialization/descriptors/SerialDescriptor;) ASTORE (3) ALOAD (1) ALOAD (3) - INVOKEINTERFACE (kotlinx/serialization/Encoder, beginStructure, (Lkotlinx/serialization/SerialDescriptor;)Lkotlinx/serialization/CompositeEncoder;) + INVOKEINTERFACE (kotlinx/serialization/encoding/Encoder, beginStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeEncoder;) ASTORE (4) ALOAD (4) ALOAD (3) ICONST_0 ALOAD (2) INVOKEVIRTUAL (User, getFirstName, ()Ljava/lang/String;) - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, encodeStringElement, (Lkotlinx/serialization/SerialDescriptor;ILjava/lang/String;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILjava/lang/String;)V) ALOAD (4) ALOAD (3) ICONST_1 ALOAD (2) INVOKEVIRTUAL (User, getLastName, ()Ljava/lang/String;) - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, encodeStringElement, (Lkotlinx/serialization/SerialDescriptor;ILjava/lang/String;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILjava/lang/String;)V) ALOAD (4) ALOAD (3) - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, endStructure, (Lkotlinx/serialization/SerialDescriptor;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, endStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)V) RETURN LABEL (L2) } - public void serialize(kotlinx.serialization.Encoder encoder, java.lang.Object value) { + public void serialize(kotlinx.serialization.encoding.Encoder encoder, java.lang.Object value) { LABEL (L0) ALOAD (0) ALOAD (1) ALOAD (2) CHECKCAST - INVOKEVIRTUAL (User$$serializer, serialize, (Lkotlinx/serialization/Encoder;LUser;)V) + INVOKEVIRTUAL (User$$serializer, serialize, (Lkotlinx/serialization/encoding/Encoder;LUser;)V) RETURN LABEL (L1) } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.txt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.txt index 343aaad3ec8..a821c67dbb6 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.txt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.txt @@ -1,5 +1,5 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serialization/internal/GeneratedSerializer { - private final static kotlinx.serialization.SerialDescriptor $$serialDesc + private final static kotlinx.serialization.descriptors.SerialDescriptor $$serialDesc public final static ListOfUsers$$serializer INSTANCE @@ -25,7 +25,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa ICONST_0 INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V) ALOAD (0) - PUTSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) + PUTSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;) RETURN } @@ -54,12 +54,12 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa LABEL (L1) } - public ListOfUsers deserialize(kotlinx.serialization.Decoder decoder) { + public ListOfUsers deserialize(kotlinx.serialization.encoding.Decoder decoder) { LABEL (L0) ALOAD (1) LDC (decoder) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - GETSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) + GETSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;) ASTORE (2) ICONST_0 ISTORE (4) @@ -67,10 +67,10 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa ASTORE (5) ALOAD (1) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/Decoder, beginStructure, (Lkotlinx/serialization/SerialDescriptor;)Lkotlinx/serialization/CompositeDecoder;) + INVOKEINTERFACE (kotlinx/serialization/encoding/Decoder, beginStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeDecoder;) ASTORE (1) ALOAD (1) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeSequentially, ()Z) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSequentially, ()Z) IFEQ (L1) ALOAD (1) ALOAD (2) @@ -80,7 +80,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa GETSTATIC (INSTANCE, LUser$$serializer;) CHECKCAST INVOKESPECIAL (kotlinx/serialization/internal/ArrayListSerializer, , (Lkotlinx/serialization/KSerializer;)V) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;)Ljava/lang/Object;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;)Ljava/lang/Object;) CHECKCAST ASTORE (5) LDC (2147483647) @@ -89,7 +89,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa LABEL (L1) ALOAD (1) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeElementIndex, (Lkotlinx/serialization/SerialDescriptor;)I) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeElementIndex, (Lkotlinx/serialization/descriptors/SerialDescriptor;)I) ISTORE (3) ILOAD (3) TABLESWITCH @@ -103,7 +103,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa CHECKCAST INVOKESPECIAL (kotlinx/serialization/internal/ArrayListSerializer, , (Lkotlinx/serialization/KSerializer;)V) ALOAD (5) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;) CHECKCAST ASTORE (5) ILOAD (4) @@ -114,7 +114,7 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa LABEL (L2) ALOAD (1) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, endStructure, (Lkotlinx/serialization/SerialDescriptor;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, endStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)V) NEW DUP ILOAD (4) @@ -132,22 +132,22 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa LABEL (L5) } - public java.lang.Object deserialize(kotlinx.serialization.Decoder p0) { + public java.lang.Object deserialize(kotlinx.serialization.encoding.Decoder p0) { LABEL (L0) LINENUMBER (13) ALOAD (0) ALOAD (1) - INVOKEVIRTUAL (ListOfUsers$$serializer, deserialize, (Lkotlinx/serialization/Decoder;)LListOfUsers;) + INVOKEVIRTUAL (ListOfUsers$$serializer, deserialize, (Lkotlinx/serialization/encoding/Decoder;)LListOfUsers;) ARETURN } - public kotlinx.serialization.SerialDescriptor getDescriptor() + public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor() - public ListOfUsers patch(kotlinx.serialization.Decoder decoder, ListOfUsers old) + public ListOfUsers patch(kotlinx.serialization.encoding.Decoder decoder, ListOfUsers old) - public java.lang.Object patch(kotlinx.serialization.Decoder p0, java.lang.Object p1) + public java.lang.Object patch(kotlinx.serialization.encoding.Decoder p0, java.lang.Object p1) - public void serialize(kotlinx.serialization.Encoder encoder, ListOfUsers value) { + public void serialize(kotlinx.serialization.encoding.Encoder encoder, ListOfUsers value) { LABEL (L0) ALOAD (1) LDC (encoder) @@ -155,31 +155,31 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa ALOAD (2) LDC (value) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - GETSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) + GETSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;) ASTORE (3) ALOAD (1) ALOAD (3) - INVOKEINTERFACE (kotlinx/serialization/Encoder, beginStructure, (Lkotlinx/serialization/SerialDescriptor;)Lkotlinx/serialization/CompositeEncoder;) + INVOKEINTERFACE (kotlinx/serialization/encoding/Encoder, beginStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeEncoder;) ASTORE (1) ALOAD (2) ALOAD (1) ALOAD (3) - INVOKESTATIC (ListOfUsers, write$Self, (LListOfUsers;Lkotlinx/serialization/CompositeEncoder;Lkotlinx/serialization/SerialDescriptor;)V) + INVOKESTATIC (ListOfUsers, write$Self, (LListOfUsers;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V) ALOAD (1) ALOAD (3) - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, endStructure, (Lkotlinx/serialization/SerialDescriptor;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, endStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)V) RETURN LABEL (L1) } - public void serialize(kotlinx.serialization.Encoder p0, java.lang.Object p1) { + public void serialize(kotlinx.serialization.encoding.Encoder p0, java.lang.Object p1) { LABEL (L0) LINENUMBER (13) ALOAD (0) ALOAD (1) ALOAD (2) CHECKCAST - INVOKEVIRTUAL (ListOfUsers$$serializer, serialize, (Lkotlinx/serialization/Encoder;LListOfUsers;)V) + INVOKEVIRTUAL (ListOfUsers$$serializer, serialize, (Lkotlinx/serialization/encoding/Encoder;LListOfUsers;)V) RETURN } @@ -262,7 +262,7 @@ public final class ListOfUsers : java/lang/Object { public final java.util.List getList() - public final static void write$Self(ListOfUsers self, kotlinx.serialization.CompositeEncoder output, kotlinx.serialization.SerialDescriptor serialDesc) { + public final static void write$Self(ListOfUsers self, kotlinx.serialization.encoding.CompositeEncoder output, kotlinx.serialization.descriptors.SerialDescriptor serialDesc) { LABEL (L0) ALOAD (0) LDC (self) @@ -283,14 +283,14 @@ public final class ListOfUsers : java/lang/Object { INVOKESPECIAL (kotlinx/serialization/internal/ArrayListSerializer, , (Lkotlinx/serialization/KSerializer;)V) ALOAD (0) GETFIELD (list, Ljava/util/List;) - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, encodeSerializableElement, (Lkotlinx/serialization/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V) RETURN LABEL (L1) } } public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serialization/internal/GeneratedSerializer { - private final static kotlinx.serialization.SerialDescriptor $$serialDesc + private final static kotlinx.serialization.descriptors.SerialDescriptor $$serialDesc public final static OptionalUser$$serializer INSTANCE @@ -316,7 +316,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ ICONST_1 INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V) ALOAD (0) - PUTSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) + PUTSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;) RETURN } @@ -342,12 +342,12 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ LABEL (L1) } - public OptionalUser deserialize(kotlinx.serialization.Decoder decoder) { + public OptionalUser deserialize(kotlinx.serialization.encoding.Decoder decoder) { LABEL (L0) ALOAD (1) LDC (decoder) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - GETSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) + GETSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;) ASTORE (2) ICONST_0 ISTORE (4) @@ -355,17 +355,17 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ ASTORE (5) ALOAD (1) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/Decoder, beginStructure, (Lkotlinx/serialization/SerialDescriptor;)Lkotlinx/serialization/CompositeDecoder;) + INVOKEINTERFACE (kotlinx/serialization/encoding/Decoder, beginStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeDecoder;) ASTORE (1) ALOAD (1) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeSequentially, ()Z) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSequentially, ()Z) IFEQ (L1) ALOAD (1) ALOAD (2) ICONST_0 GETSTATIC (INSTANCE, LUser$$serializer;) CHECKCAST - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;)Ljava/lang/Object;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;)Ljava/lang/Object;) CHECKCAST ASTORE (5) LDC (2147483647) @@ -374,7 +374,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ LABEL (L1) ALOAD (1) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeElementIndex, (Lkotlinx/serialization/SerialDescriptor;)I) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeElementIndex, (Lkotlinx/serialization/descriptors/SerialDescriptor;)I) ISTORE (3) ILOAD (3) TABLESWITCH @@ -385,7 +385,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ GETSTATIC (INSTANCE, LUser$$serializer;) CHECKCAST ALOAD (5) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;) CHECKCAST ASTORE (5) ILOAD (4) @@ -396,7 +396,7 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ LABEL (L2) ALOAD (1) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, endStructure, (Lkotlinx/serialization/SerialDescriptor;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, endStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)V) NEW DUP ILOAD (4) @@ -414,22 +414,22 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ LABEL (L5) } - public java.lang.Object deserialize(kotlinx.serialization.Decoder p0) { + public java.lang.Object deserialize(kotlinx.serialization.encoding.Decoder p0) { LABEL (L0) LINENUMBER (10) ALOAD (0) ALOAD (1) - INVOKEVIRTUAL (OptionalUser$$serializer, deserialize, (Lkotlinx/serialization/Decoder;)LOptionalUser;) + INVOKEVIRTUAL (OptionalUser$$serializer, deserialize, (Lkotlinx/serialization/encoding/Decoder;)LOptionalUser;) ARETURN } - public kotlinx.serialization.SerialDescriptor getDescriptor() + public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor() - public OptionalUser patch(kotlinx.serialization.Decoder decoder, OptionalUser old) + public OptionalUser patch(kotlinx.serialization.encoding.Decoder decoder, OptionalUser old) - public java.lang.Object patch(kotlinx.serialization.Decoder p0, java.lang.Object p1) + public java.lang.Object patch(kotlinx.serialization.encoding.Decoder p0, java.lang.Object p1) - public void serialize(kotlinx.serialization.Encoder encoder, OptionalUser value) { + public void serialize(kotlinx.serialization.encoding.Encoder encoder, OptionalUser value) { LABEL (L0) ALOAD (1) LDC (encoder) @@ -437,31 +437,31 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ ALOAD (2) LDC (value) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - GETSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) + GETSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;) ASTORE (3) ALOAD (1) ALOAD (3) - INVOKEINTERFACE (kotlinx/serialization/Encoder, beginStructure, (Lkotlinx/serialization/SerialDescriptor;)Lkotlinx/serialization/CompositeEncoder;) + INVOKEINTERFACE (kotlinx/serialization/encoding/Encoder, beginStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeEncoder;) ASTORE (1) ALOAD (2) ALOAD (1) ALOAD (3) - INVOKESTATIC (OptionalUser, write$Self, (LOptionalUser;Lkotlinx/serialization/CompositeEncoder;Lkotlinx/serialization/SerialDescriptor;)V) + INVOKESTATIC (OptionalUser, write$Self, (LOptionalUser;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V) ALOAD (1) ALOAD (3) - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, endStructure, (Lkotlinx/serialization/SerialDescriptor;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, endStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)V) RETURN LABEL (L1) } - public void serialize(kotlinx.serialization.Encoder p0, java.lang.Object p1) { + public void serialize(kotlinx.serialization.encoding.Encoder p0, java.lang.Object p1) { LABEL (L0) LINENUMBER (10) ALOAD (0) ALOAD (1) ALOAD (2) CHECKCAST - INVOKEVIRTUAL (OptionalUser$$serializer, serialize, (Lkotlinx/serialization/Encoder;LOptionalUser;)V) + INVOKEVIRTUAL (OptionalUser$$serializer, serialize, (Lkotlinx/serialization/encoding/Encoder;LOptionalUser;)V) RETURN } @@ -578,7 +578,7 @@ public final class OptionalUser : java/lang/Object { public final User getUser() - public final static void write$Self(OptionalUser self, kotlinx.serialization.CompositeEncoder output, kotlinx.serialization.SerialDescriptor serialDesc) { + public final static void write$Self(OptionalUser self, kotlinx.serialization.encoding.CompositeEncoder output, kotlinx.serialization.descriptors.SerialDescriptor serialDesc) { LABEL (L0) ALOAD (0) LDC (self) @@ -605,7 +605,7 @@ public final class OptionalUser : java/lang/Object { ALOAD (1) ALOAD (2) ICONST_0 - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, shouldEncodeElementDefault, (Lkotlinx/serialization/SerialDescriptor;I)Z) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, shouldEncodeElementDefault, (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Z) IFEQ (L3) LABEL (L2) ALOAD (1) @@ -615,7 +615,7 @@ public final class OptionalUser : java/lang/Object { CHECKCAST ALOAD (0) GETFIELD (user, LUser;) - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, encodeSerializableElement, (Lkotlinx/serialization/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeSerializableElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V) LABEL (L3) RETURN LABEL (L4) @@ -623,7 +623,7 @@ public final class OptionalUser : java/lang/Object { } public final class User$$serializer : java/lang/Object, kotlinx/serialization/internal/GeneratedSerializer { - private final static kotlinx.serialization.SerialDescriptor $$serialDesc + private final static kotlinx.serialization.descriptors.SerialDescriptor $$serialDesc public final static User$$serializer INSTANCE @@ -653,7 +653,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in ICONST_0 INVOKEVIRTUAL (kotlinx/serialization/internal/PluginGeneratedSerialDescriptor, addElement, (Ljava/lang/String;Z)V) ALOAD (0) - PUTSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) + PUTSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;) RETURN } @@ -684,12 +684,12 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in LABEL (L1) } - public User deserialize(kotlinx.serialization.Decoder decoder) { + public User deserialize(kotlinx.serialization.encoding.Decoder decoder) { LABEL (L0) ALOAD (1) LDC (decoder) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - GETSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) + GETSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;) ASTORE (2) ICONST_0 ISTORE (4) @@ -699,20 +699,20 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in ASTORE (6) ALOAD (1) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/Decoder, beginStructure, (Lkotlinx/serialization/SerialDescriptor;)Lkotlinx/serialization/CompositeDecoder;) + INVOKEINTERFACE (kotlinx/serialization/encoding/Decoder, beginStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeDecoder;) ASTORE (1) ALOAD (1) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeSequentially, ()Z) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeSequentially, ()Z) IFEQ (L1) ALOAD (1) ALOAD (2) ICONST_0 - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/SerialDescriptor;I)Ljava/lang/String;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Ljava/lang/String;) ASTORE (5) ALOAD (1) ALOAD (2) ICONST_1 - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/SerialDescriptor;I)Ljava/lang/String;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Ljava/lang/String;) ASTORE (6) LDC (2147483647) ISTORE (4) @@ -720,7 +720,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in LABEL (L1) ALOAD (1) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeElementIndex, (Lkotlinx/serialization/SerialDescriptor;)I) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeElementIndex, (Lkotlinx/serialization/descriptors/SerialDescriptor;)I) ISTORE (3) ILOAD (3) TABLESWITCH @@ -728,7 +728,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in ALOAD (1) ALOAD (2) ICONST_0 - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/SerialDescriptor;I)Ljava/lang/String;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Ljava/lang/String;) ASTORE (5) ILOAD (4) ICONST_1 @@ -739,7 +739,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in ALOAD (1) ALOAD (2) ICONST_1 - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/SerialDescriptor;I)Ljava/lang/String;) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, decodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Ljava/lang/String;) ASTORE (6) ILOAD (4) ICONST_2 @@ -749,7 +749,7 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in LABEL (L2) ALOAD (1) ALOAD (2) - INVOKEINTERFACE (kotlinx/serialization/CompositeDecoder, endStructure, (Lkotlinx/serialization/SerialDescriptor;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeDecoder, endStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)V) NEW DUP ILOAD (4) @@ -768,22 +768,22 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in LABEL (L6) } - public java.lang.Object deserialize(kotlinx.serialization.Decoder p0) { + public java.lang.Object deserialize(kotlinx.serialization.encoding.Decoder p0) { LABEL (L0) LINENUMBER (7) ALOAD (0) ALOAD (1) - INVOKEVIRTUAL (User$$serializer, deserialize, (Lkotlinx/serialization/Decoder;)LUser;) + INVOKEVIRTUAL (User$$serializer, deserialize, (Lkotlinx/serialization/encoding/Decoder;)LUser;) ARETURN } - public kotlinx.serialization.SerialDescriptor getDescriptor() + public kotlinx.serialization.descriptors.SerialDescriptor getDescriptor() - public User patch(kotlinx.serialization.Decoder decoder, User old) + public User patch(kotlinx.serialization.encoding.Decoder decoder, User old) - public java.lang.Object patch(kotlinx.serialization.Decoder p0, java.lang.Object p1) + public java.lang.Object patch(kotlinx.serialization.encoding.Decoder p0, java.lang.Object p1) - public void serialize(kotlinx.serialization.Encoder encoder, User value) { + public void serialize(kotlinx.serialization.encoding.Encoder encoder, User value) { LABEL (L0) ALOAD (1) LDC (encoder) @@ -791,31 +791,31 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in ALOAD (2) LDC (value) INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V) - GETSTATIC ($$serialDesc, Lkotlinx/serialization/SerialDescriptor;) + GETSTATIC ($$serialDesc, Lkotlinx/serialization/descriptors/SerialDescriptor;) ASTORE (3) ALOAD (1) ALOAD (3) - INVOKEINTERFACE (kotlinx/serialization/Encoder, beginStructure, (Lkotlinx/serialization/SerialDescriptor;)Lkotlinx/serialization/CompositeEncoder;) + INVOKEINTERFACE (kotlinx/serialization/encoding/Encoder, beginStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeEncoder;) ASTORE (1) ALOAD (2) ALOAD (1) ALOAD (3) - INVOKESTATIC (User, write$Self, (LUser;Lkotlinx/serialization/CompositeEncoder;Lkotlinx/serialization/SerialDescriptor;)V) + INVOKESTATIC (User, write$Self, (LUser;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V) ALOAD (1) ALOAD (3) - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, endStructure, (Lkotlinx/serialization/SerialDescriptor;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, endStructure, (Lkotlinx/serialization/descriptors/SerialDescriptor;)V) RETURN LABEL (L1) } - public void serialize(kotlinx.serialization.Encoder p0, java.lang.Object p1) { + public void serialize(kotlinx.serialization.encoding.Encoder p0, java.lang.Object p1) { LABEL (L0) LINENUMBER (7) ALOAD (0) ALOAD (1) ALOAD (2) CHECKCAST - INVOKEVIRTUAL (User$$serializer, serialize, (Lkotlinx/serialization/Encoder;LUser;)V) + INVOKEVIRTUAL (User$$serializer, serialize, (Lkotlinx/serialization/encoding/Encoder;LUser;)V) RETURN } @@ -922,7 +922,7 @@ public final class User : java/lang/Object { public final java.lang.String getLastName() - public final static void write$Self(User self, kotlinx.serialization.CompositeEncoder output, kotlinx.serialization.SerialDescriptor serialDesc) { + public final static void write$Self(User self, kotlinx.serialization.encoding.CompositeEncoder output, kotlinx.serialization.descriptors.SerialDescriptor serialDesc) { LABEL (L0) ALOAD (0) LDC (self) @@ -938,13 +938,13 @@ public final class User : java/lang/Object { ICONST_0 ALOAD (0) GETFIELD (firstName, Ljava/lang/String;) - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, encodeStringElement, (Lkotlinx/serialization/SerialDescriptor;ILjava/lang/String;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILjava/lang/String;)V) ALOAD (1) ALOAD (2) ICONST_1 ALOAD (0) GETFIELD (lastName, Ljava/lang/String;) - INVOKEINTERFACE (kotlinx/serialization/CompositeEncoder, encodeStringElement, (Lkotlinx/serialization/SerialDescriptor;ILjava/lang/String;)V) + INVOKEINTERFACE (kotlinx/serialization/encoding/CompositeEncoder, encodeStringElement, (Lkotlinx/serialization/descriptors/SerialDescriptor;ILjava/lang/String;)V) RETURN LABEL (L1) } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/DuplicateSerialName.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/DuplicateSerialName.kt index 38a741b9f03..7690dec6678 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/DuplicateSerialName.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/DuplicateSerialName.kt @@ -1,4 +1,4 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE,-PROVIDED_RUNTIME_TOO_LOW +// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE // FILE: test.kt import kotlinx.serialization.* diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/DuplicateSerialName.txt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/DuplicateSerialName.txt index 9fc72f1569f..e97115b80ae 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/DuplicateSerialName.txt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/DuplicateSerialName.txt @@ -10,13 +10,13 @@ package @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "This synthesized declaration should not be used directly", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public object `$serializer` : kotlinx.serialization.internal.GeneratedSerializer { private constructor `$serializer`() - public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.SerialDescriptor + public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.descriptors.SerialDescriptor public open override /*1*/ /*synthesized*/ fun childSerializers(): kotlin.Array> - public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.Decoder): Derived + public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.encoding.Decoder): Derived public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.Decoder, /*1*/ old: Derived): Derived - public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.Encoder, /*1*/ value: Derived): kotlin.Unit + @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.encoding.Decoder, /*1*/ old: Derived): Derived + public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.encoding.Encoder, /*1*/ value: Derived): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun typeParametersSerializers(): kotlin.Array> } @@ -40,13 +40,13 @@ package @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "This synthesized declaration should not be used directly", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public object `$serializer` : kotlinx.serialization.internal.GeneratedSerializer { private constructor `$serializer`() - public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.SerialDescriptor + public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.descriptors.SerialDescriptor public open override /*1*/ /*synthesized*/ fun childSerializers(): kotlin.Array> - public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.Decoder): Parent + public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.encoding.Decoder): Parent public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.Decoder, /*1*/ old: Parent): Parent - public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.Encoder, /*1*/ value: Parent): kotlin.Unit + @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.encoding.Decoder, /*1*/ old: Parent): Parent + public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.encoding.Encoder, /*1*/ value: Parent): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun typeParametersSerializers(): kotlin.Array> } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/IncorrectTransient.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/IncorrectTransient.kt index 15fb7a6750f..b1eef1936d2 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/IncorrectTransient.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/IncorrectTransient.kt @@ -1,4 +1,4 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE,-PROVIDED_RUNTIME_TOO_LOW +// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE // WITH_RUNTIME // SKIP_TXT diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/IncorrectTransient2.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/IncorrectTransient2.kt index 95edd98c5d7..8c1e812a131 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/IncorrectTransient2.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/IncorrectTransient2.kt @@ -1,4 +1,4 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE,-PROVIDED_RUNTIME_TOO_LOW +// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE // WITH_RUNTIME // SKIP_TXT diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/LazyRecursionBug.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/LazyRecursionBug.kt index 6bda2763fc0..d2455d7f342 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/LazyRecursionBug.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/LazyRecursionBug.kt @@ -1,4 +1,3 @@ -// !DIAGNOSTICS: -PROVIDED_RUNTIME_TOO_LOW // This test enshures that analysis ends up without compiler exceptions import kotlinx.serialization.* diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/LazyRecursionBug.txt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/LazyRecursionBug.txt index c24f2aa3ed9..9785192e6af 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/LazyRecursionBug.txt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/LazyRecursionBug.txt @@ -9,12 +9,12 @@ package @kotlinx.serialization.Serializer(forClass = Digest::class) public companion object Companion : kotlinx.serialization.KSerializer { private constructor Companion() - public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.SerialDescriptor - public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.Decoder): Digest + public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.descriptors.SerialDescriptor + public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.encoding.Decoder): Digest public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.Decoder, /*1*/ old: Digest): Digest - public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.Encoder, /*1*/ value: Digest): kotlin.Unit + @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.encoding.Decoder, /*1*/ old: Digest): Digest + public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.encoding.Encoder, /*1*/ value: Digest): kotlin.Unit public final /*synthesized*/ fun serializer(): kotlinx.serialization.KSerializer public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NoSuitableCtorInParent.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NoSuitableCtorInParent.kt index 8427c2e996b..bf721ed6639 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NoSuitableCtorInParent.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NoSuitableCtorInParent.kt @@ -1,4 +1,4 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE,-PROVIDED_RUNTIME_TOO_LOW +// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE // FILE: test.kt import kotlinx.serialization.* diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NoSuitableCtorInParent.txt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NoSuitableCtorInParent.txt index 062fb01dc3a..e12efb7ccfd 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NoSuitableCtorInParent.txt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NoSuitableCtorInParent.txt @@ -11,13 +11,13 @@ package @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "This synthesized declaration should not be used directly", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public object `$serializer` : kotlinx.serialization.internal.GeneratedSerializer { private constructor `$serializer`() - public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.SerialDescriptor + public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.descriptors.SerialDescriptor public open override /*1*/ /*synthesized*/ fun childSerializers(): kotlin.Array> - public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.Decoder): Derived + public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.encoding.Decoder): Derived public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.Decoder, /*1*/ old: Derived): Derived - public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.Encoder, /*1*/ value: Derived): kotlin.Unit + @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.encoding.Decoder, /*1*/ old: Derived): Derived + public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.encoding.Encoder, /*1*/ value: Derived): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun typeParametersSerializers(): kotlin.Array> } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NonSerializable.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NonSerializable.kt index b08ad9ec8a1..4f14242cf2f 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NonSerializable.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NonSerializable.kt @@ -1,4 +1,4 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE,-PROVIDED_RUNTIME_TOO_LOW +// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE // FILE: test.kt import kotlinx.serialization.* diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NonSerializable.txt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NonSerializable.txt index 63d1e837933..9dcee6c1988 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NonSerializable.txt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NonSerializable.txt @@ -10,13 +10,13 @@ package @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "This synthesized declaration should not be used directly", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public object `$serializer` : kotlinx.serialization.internal.GeneratedSerializer { private constructor `$serializer`() - public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.SerialDescriptor + public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.descriptors.SerialDescriptor public open override /*1*/ /*synthesized*/ fun childSerializers(): kotlin.Array> - public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.Decoder): Basic + public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.encoding.Decoder): Basic public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.Decoder, /*1*/ old: Basic): Basic - public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.Encoder, /*1*/ value: Basic): kotlin.Unit + @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.encoding.Decoder, /*1*/ old: Basic): Basic + public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.encoding.Encoder, /*1*/ value: Basic): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun typeParametersSerializers(): kotlin.Array> } @@ -40,13 +40,13 @@ package @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "This synthesized declaration should not be used directly", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public object `$serializer` : kotlinx.serialization.internal.GeneratedSerializer { private constructor `$serializer`() - public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.SerialDescriptor + public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.descriptors.SerialDescriptor public open override /*1*/ /*synthesized*/ fun childSerializers(): kotlin.Array> - public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.Decoder): Inside + public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.encoding.Decoder): Inside public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.Decoder, /*1*/ old: Inside): Inside - public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.Encoder, /*1*/ value: Inside): kotlin.Unit + @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.encoding.Decoder, /*1*/ old: Inside): Inside + public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.encoding.Encoder, /*1*/ value: Inside): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun typeParametersSerializers(): kotlin.Array> } @@ -77,13 +77,13 @@ public final class NonSerializable { @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "This synthesized declaration should not be used directly", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public object `$serializer` : kotlinx.serialization.internal.GeneratedSerializer { private constructor `$serializer`() - public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.SerialDescriptor + public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.descriptors.SerialDescriptor public open override /*1*/ /*synthesized*/ fun childSerializers(): kotlin.Array> - public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.Decoder): WithImplicitType + public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.encoding.Decoder): WithImplicitType public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.Decoder, /*1*/ old: WithImplicitType): WithImplicitType - public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.Encoder, /*1*/ value: WithImplicitType): kotlin.Unit + @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.encoding.Decoder, /*1*/ old: WithImplicitType): WithImplicitType + public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.encoding.Encoder, /*1*/ value: WithImplicitType): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun typeParametersSerializers(): kotlin.Array> } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NullabilityIncompatible.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NullabilityIncompatible.kt index d12e807027c..b7f78a94933 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NullabilityIncompatible.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NullabilityIncompatible.kt @@ -1,7 +1,9 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE,-PROVIDED_RUNTIME_TOO_LOW +// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE // FILE: test.kt import kotlinx.serialization.* +import kotlinx.serialization.descriptors.* +import kotlinx.serialization.encoding.* @Serializable(NopeNullableSerializer::class) class Nope {} diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NullabilityIncompatible.txt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NullabilityIncompatible.txt index cc95a4080b9..2a5a923ecf3 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NullabilityIncompatible.txt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/NullabilityIncompatible.txt @@ -10,13 +10,13 @@ package @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "This synthesized declaration should not be used directly", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public object `$serializer` : kotlinx.serialization.internal.GeneratedSerializer { private constructor `$serializer`() - public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.SerialDescriptor + public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.descriptors.SerialDescriptor public open override /*1*/ /*synthesized*/ fun childSerializers(): kotlin.Array> - public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.Decoder): Foo + public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.encoding.Decoder): Foo public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.Decoder, /*1*/ old: Foo): Foo - public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.Encoder, /*1*/ value: Foo): kotlin.Unit + @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.encoding.Decoder, /*1*/ old: Foo): Foo + public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.encoding.Encoder, /*1*/ value: Foo): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun typeParametersSerializers(): kotlin.Array> } @@ -47,11 +47,11 @@ package public final class NopeNullableSerializer : kotlinx.serialization.KSerializer { public constructor NopeNullableSerializer() - public open override /*1*/ val descriptor: kotlinx.serialization.SerialDescriptor - public open override /*1*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.Decoder): Nope? + public open override /*1*/ val descriptor: kotlinx.serialization.descriptors.SerialDescriptor + public open override /*1*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.encoding.Decoder): Nope? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.Decoder, /*1*/ old: Nope?): Nope? - public open override /*1*/ fun serialize(/*0*/ encoder: kotlinx.serialization.Encoder, /*1*/ value: Nope?): kotlin.Nothing + @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.encoding.Decoder, /*1*/ old: Nope?): Nope? + public open override /*1*/ fun serialize(/*0*/ encoder: kotlinx.serialization.encoding.Encoder, /*1*/ value: Nope?): kotlin.Nothing public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/ParamIsNotProperty.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/ParamIsNotProperty.kt index cc26a9c76be..bb14e4124af 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/ParamIsNotProperty.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/ParamIsNotProperty.kt @@ -1,4 +1,4 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE,-PROVIDED_RUNTIME_TOO_LOW +// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE // FILE: test.kt import kotlinx.serialization.* diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/ParamIsNotProperty.txt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/ParamIsNotProperty.txt index 95fdd7f9940..055c8fd8971 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/ParamIsNotProperty.txt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/ParamIsNotProperty.txt @@ -10,13 +10,13 @@ package @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "This synthesized declaration should not be used directly", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public object `$serializer` : kotlinx.serialization.internal.GeneratedSerializer { private constructor `$serializer`() - public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.SerialDescriptor + public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.descriptors.SerialDescriptor public open override /*1*/ /*synthesized*/ fun childSerializers(): kotlin.Array> - public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.Decoder): Test + public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.encoding.Decoder): Test public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.Decoder, /*1*/ old: Test): Test - public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.Encoder, /*1*/ value: Test): kotlin.Unit + @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.encoding.Decoder, /*1*/ old: Test): Test + public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.encoding.Encoder, /*1*/ value: Test): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun typeParametersSerializers(): kotlin.Array> } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/SerializableEnums.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/SerializableEnums.kt index f9360d9cebe..d5e4fe4158f 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/SerializableEnums.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/SerializableEnums.kt @@ -1,7 +1,8 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE,-PROVIDED_RUNTIME_TOO_LOW +// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE // FILE: test.kt import kotlinx.serialization.* +import kotlinx.serialization.encoding.* enum class SimpleEnum { A, B } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/SerializableEnums.txt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/SerializableEnums.txt index 12d4d159183..abbe0f712ec 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/SerializableEnums.txt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/SerializableEnums.txt @@ -3,11 +3,11 @@ package public object EnumSerializer : kotlinx.serialization.KSerializer { private constructor EnumSerializer() public open override /*1*/ val descriptor: kotlin.Nothing - public open override /*1*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.Decoder): ExplicitlyMarkedEnumCustom + public open override /*1*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.encoding.Decoder): ExplicitlyMarkedEnumCustom public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.Decoder, /*1*/ old: ExplicitlyMarkedEnumCustom): ExplicitlyMarkedEnumCustom - public open override /*1*/ fun serialize(/*0*/ encoder: kotlinx.serialization.Encoder, /*1*/ value: ExplicitlyMarkedEnumCustom): kotlin.Nothing + @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.encoding.Decoder, /*1*/ old: ExplicitlyMarkedEnumCustom): ExplicitlyMarkedEnumCustom + public open override /*1*/ fun serialize(/*0*/ encoder: kotlinx.serialization.encoding.Encoder, /*1*/ value: ExplicitlyMarkedEnumCustom): kotlin.Nothing public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -29,13 +29,13 @@ public object EnumSerializer : kotlinx.serialization.KSerializer { private constructor `$serializer`() - public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.SerialDescriptor + public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.descriptors.SerialDescriptor public open override /*1*/ /*synthesized*/ fun childSerializers(): kotlin.Array> - public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.Decoder): ExplicitlyMarkedEnum + public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.encoding.Decoder): ExplicitlyMarkedEnum public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.Decoder, /*1*/ old: ExplicitlyMarkedEnum): ExplicitlyMarkedEnum - public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.Encoder, /*1*/ value: ExplicitlyMarkedEnum): kotlin.Unit + @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.encoding.Decoder, /*1*/ old: ExplicitlyMarkedEnum): ExplicitlyMarkedEnum + public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.encoding.Encoder, /*1*/ value: ExplicitlyMarkedEnum): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun typeParametersSerializers(): kotlin.Array> } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/SerializableIgnored.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/SerializableIgnored.kt index 38135d7298b..2786911d24c 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/SerializableIgnored.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/SerializableIgnored.kt @@ -1,4 +1,4 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE,-PROVIDED_RUNTIME_TOO_LOW +// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE // FILE: test.kt import kotlinx.serialization.* diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/Transients.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/Transients.kt index 57bc7e83926..4a8eb2139d7 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/Transients.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/Transients.kt @@ -1,4 +1,4 @@ -// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE,-PROVIDED_RUNTIME_TOO_LOW +// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE // FILE: test.kt import kotlinx.serialization.* diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/Transients.txt b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/Transients.txt index 1a84e6c3901..38dac7a4101 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/Transients.txt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/testData/diagnostics/Transients.txt @@ -14,13 +14,13 @@ package @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "This synthesized declaration should not be used directly", replaceWith = kotlin.ReplaceWith(expression = "", imports = {})) public object `$serializer` : kotlinx.serialization.internal.GeneratedSerializer { private constructor `$serializer`() - public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.SerialDescriptor + public open override /*1*/ /*synthesized*/ val descriptor: kotlinx.serialization.descriptors.SerialDescriptor public open override /*1*/ /*synthesized*/ fun childSerializers(): kotlin.Array> - public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.Decoder): WithTransients + public open override /*1*/ /*synthesized*/ fun deserialize(/*0*/ decoder: kotlinx.serialization.encoding.Decoder): WithTransients public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.Decoder, /*1*/ old: WithTransients): WithTransients - public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.Encoder, /*1*/ value: WithTransients): kotlin.Unit + @kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "Patch function is deprecated for removal since this functionality is no longer supported by serializer.Some formats may provide implementation-specific patching in their Decoders.") public open override /*1*/ /*fake_override*/ fun patch(/*0*/ decoder: kotlinx.serialization.encoding.Decoder, /*1*/ old: WithTransients): WithTransients + public open override /*1*/ /*synthesized*/ fun serialize(/*0*/ encoder: kotlinx.serialization.encoding.Encoder, /*1*/ value: WithTransients): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun typeParametersSerializers(): kotlin.Array> } diff --git a/tests/mute-common.csv b/tests/mute-common.csv index 680eda562ac..e69ded46b7f 100644 --- a/tests/mute-common.csv +++ b/tests/mute-common.csv @@ -55,6 +55,4 @@ org.jetbrains.kotlin.idea.debugger.test.AsyncStackTraceTestGenerated.testAsyncLa org.jetbrains.kotlin.idea.debugger.test.KotlinSteppingTestGenerated.StepOver.testStepOverInlinedLambdaStdlib, fails after advancing bootstrap KT-37879,, org.jetbrains.kotlin.incremental.IncrementalJsKlibCompilerRunnerTestGenerated.ClassHierarchyAffected.testMethodRemoved, full fledged FO in klib required,, org.jetbrains.kotlin.idea.quickfix.QuickFixTestGenerated.ConvertToAnonymousObject.testHasConcreateMember2, Unprocessed,, -org.jetbrains.kotlin.idea.quickfix.QuickFixMultiFileTestGenerated.MakePrivateAndOverrideMember.testSetter, Unprocessed,, -org.jetbrains.kotlinx.serialization.SerializationIrBytecodeListingTestGenerated.testBasic, Serialization runtime needs update,, -org.jetbrains.kotlinx.serialization.SerializationPluginBytecodeListingTestGenerated.testBasic, Serialization runtime needs update,, \ No newline at end of file +org.jetbrains.kotlin.idea.quickfix.QuickFixMultiFileTestGenerated.MakePrivateAndOverrideMember.testSetter, Unprocessed,, \ No newline at end of file