azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update kx.serialization dependency

Browse Source 
so tests won't fail due to
'library was compiled with pre-release flag' error.

Update test data
This commit is contained in:
Leonid Startsev
2020-07-07 01:14:08 +03:00
parent 74aa3ac79a
commit 80561ec125
3 changed files with 41 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-main-kts-test/testData/hello-kotlinx-serialization.main.kts
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
@file:Repository("https://jcenter.bintray.com/")
@file:DependsOn("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0-1.4.0-dev-5730", options = ["transitive=false"])
@file:DependsOn("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0-1.4.0-rc-95", options = ["transitive=false"])
import kotlinx.serialization.*
import kotlinx.serialization.json.*
@@ -10,9 +10,9 @@ data class User(val firstName: String, val lastName: String)
val json = Json(JsonConfiguration.Stable)
val jsonData = json.stringify(User.serializer(), User("James", "Bond"))
val jsonData = json.encodeToString(User.serializer(), User("James", "Bond"))
println(jsonData)
val obj = json.parse(User.serializer(), """{"firstName":"James", "lastName":"Bond"}""")
val obj = json.decodeFromString(User.serializer(), """{"firstName":"James", "lastName":"Bond"}""")
println(obj)
plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
+1 -1
View File
@@ -22,7 +22,7 @@ dependencies {
testCompile(projectTests(":compiler:tests-common"))
testCompile(commonDep("junit:junit"))
testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0-1.4.0-dev-5730") { isTransitive = false }
testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-jvm:0.20.0-1.4.0-rc-95") { isTransitive = false }
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
plugins/kotlin-serialization/kotlin-serialization-compiler/testData/codegen/Basic.ir.txt
Vendored
+37 -45
View File
@@ -32,12 +32,11 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa
private void <init>() {
LABEL (L0)
ALOAD (0)
LABEL (L1)
LINENUMBER (12)
ALOAD (0)
INVOKESPECIAL (java/lang/Object, <init>, ()V)
RETURN
LABEL (L2)
LABEL (L1)
}
public kotlinx.serialization.KSerializer[] childSerializers() {
@@ -228,12 +227,11 @@ public final class ListOfUsers$$serializer : java/lang/Object, kotlinx/serializa
public final class ListOfUsers$Companion : java/lang/Object {
private void <init>() {
LABEL (L0)
ALOAD (0)
LABEL (L1)
LINENUMBER (12)
ALOAD (0)
INVOKESPECIAL (java/lang/Object, <init>, ()V)
RETURN
LABEL (L2)
LABEL (L1)
}
public void <init>(kotlin.jvm.internal.DefaultConstructorMarker $constructor_marker) {
@@ -266,9 +264,9 @@ public final class ListOfUsers : java/lang/Object {
ALOAD (1)
LDC (list)
INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
ALOAD (0)
LABEL (L1)
LINENUMBER (12)
ALOAD (0)
INVOKESPECIAL (java/lang/Object, <init>, ()V)
LABEL (L2)
LINENUMBER (13)
@@ -281,27 +279,26 @@ public final class ListOfUsers : java/lang/Object {
public void <init>(int seen1, java.util.List list, kotlinx.serialization.internal.SerializationConstructorMarker serializationConstructorMarker) {
LABEL (L0)
ALOAD (0)
LABEL (L1)
LINENUMBER (12)
ALOAD (0)
INVOKESPECIAL (java/lang/Object, <init>, ()V)
ILOAD (1)
ICONST_1
IAND
IFNE (L2)
IFNE (L1)
NEW
DUP
LDC (list)
INVOKESPECIAL (kotlinx/serialization/MissingFieldException, <init>, (Ljava/lang/String;)V)
ATHROW
LABEL (L2)
LABEL (L1)
ALOAD (0)
ALOAD (2)
PUTFIELD (list, Ljava/util/List;)
LABEL (L3)
LABEL (L2)
LINENUMBER (13)
RETURN
LABEL (L4)
LABEL (L3)
}
public final java.util.List getList()
@@ -341,12 +338,11 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
private void <init>() {
LABEL (L0)
ALOAD (0)
LABEL (L1)
LINENUMBER (9)
ALOAD (0)
INVOKESPECIAL (java/lang/Object, <init>, ()V)
RETURN
LABEL (L2)
LABEL (L1)
}
public kotlinx.serialization.KSerializer[] childSerializers() {
@@ -491,10 +487,10 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
ASTORE (4)
ALOAD (2)
INVOKEVIRTUAL (OptionalUser, getUser, ()LUser;)
NEW
DUP
LABEL (L2)
LINENUMBER (10)
NEW
DUP
LDC ()
LDC ()
INVOKESPECIAL (User, <init>, (Ljava/lang/String;Ljava/lang/String;)V)
@@ -544,12 +540,11 @@ public final class OptionalUser$$serializer : java/lang/Object, kotlinx/serializ
public final class OptionalUser$Companion : java/lang/Object {
private void <init>() {
LABEL (L0)
ALOAD (0)
LABEL (L1)
LINENUMBER (9)
ALOAD (0)
INVOKESPECIAL (java/lang/Object, <init>, ()V)
RETURN
LABEL (L2)
LABEL (L1)
}
public void <init>(kotlin.jvm.internal.DefaultConstructorMarker $constructor_marker) {
@@ -582,9 +577,9 @@ public final class OptionalUser : java/lang/Object {
ALOAD (1)
LDC (user)
INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
ALOAD (0)
LABEL (L1)
LINENUMBER (9)
ALOAD (0)
INVOKESPECIAL (java/lang/Object, <init>, ()V)
LABEL (L2)
LINENUMBER (10)
@@ -617,26 +612,26 @@ public final class OptionalUser : java/lang/Object {
public void <init>(int seen1, User user, kotlinx.serialization.internal.SerializationConstructorMarker serializationConstructorMarker) {
LABEL (L0)
ALOAD (0)
LABEL (L1)
LINENUMBER (9)
ALOAD (0)
INVOKESPECIAL (java/lang/Object, <init>, ()V)
ILOAD (1)
ICONST_1
IAND
IFNE (L2)
IFNE (L1)
ALOAD (0)
LABEL (L2)
LINENUMBER (10)
NEW
DUP
LABEL (L3)
LINENUMBER (10)
LDC ()
LDC ()
INVOKESPECIAL (User, <init>, (Ljava/lang/String;Ljava/lang/String;)V)
LABEL (L3)
LINENUMBER (9)
PUTFIELD (user, LUser;)
GOTO (L4)
LABEL (L2)
LINENUMBER (9)
LABEL (L1)
ALOAD (0)
ALOAD (2)
PUTFIELD (user, LUser;)
@@ -698,12 +693,11 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in
private void <init>() {
LABEL (L0)
ALOAD (0)
LABEL (L1)
LINENUMBER (6)
ALOAD (0)
INVOKESPECIAL (java/lang/Object, <init>, ()V)
RETURN
LABEL (L2)
LABEL (L1)
}
public kotlinx.serialization.KSerializer[] childSerializers() {
@@ -903,12 +897,11 @@ public final class User$$serializer : java/lang/Object, kotlinx/serialization/in
public final class User$Companion : java/lang/Object {
private void <init>() {
LABEL (L0)
ALOAD (0)
LABEL (L1)
LINENUMBER (6)
ALOAD (0)
INVOKESPECIAL (java/lang/Object, <init>, ()V)
RETURN
LABEL (L2)
LABEL (L1)
}
public void <init>(kotlin.jvm.internal.DefaultConstructorMarker $constructor_marker) {
@@ -946,9 +939,9 @@ public final class User : java/lang/Object {
ALOAD (2)
LDC (lastName)
INVOKESTATIC (kotlin/jvm/internal/Intrinsics, checkNotNullParameter, (Ljava/lang/Object;Ljava/lang/String;)V)
ALOAD (0)
LABEL (L1)
LINENUMBER (6)
ALOAD (0)
INVOKESPECIAL (java/lang/Object, <init>, ()V)
LABEL (L2)
LINENUMBER (7)
@@ -964,43 +957,42 @@ public final class User : java/lang/Object {
public void <init>(int seen1, java.lang.String firstName, java.lang.String lastName, kotlinx.serialization.internal.SerializationConstructorMarker serializationConstructorMarker) {
LABEL (L0)
ALOAD (0)
LABEL (L1)
LINENUMBER (6)
ALOAD (0)
INVOKESPECIAL (java/lang/Object, <init>, ()V)
ILOAD (1)
ICONST_1
IAND
IFNE (L2)
IFNE (L1)
NEW
DUP
LDC (firstName)
INVOKESPECIAL (kotlinx/serialization/MissingFieldException, <init>, (Ljava/lang/String;)V)
ATHROW
LABEL (L2)
LABEL (L1)
ALOAD (0)
ALOAD (2)
PUTFIELD (firstName, Ljava/lang/String;)
LABEL (L3)
LABEL (L2)
LINENUMBER (7)
LINENUMBER (6)
ILOAD (1)
ICONST_2
IAND
IFNE (L4)
IFNE (L3)
NEW
DUP
LDC (lastName)
INVOKESPECIAL (kotlinx/serialization/MissingFieldException, <init>, (Ljava/lang/String;)V)
ATHROW
LABEL (L4)
LABEL (L3)
ALOAD (0)
ALOAD (3)
PUTFIELD (lastName, Ljava/lang/String;)
LABEL (L5)
LABEL (L4)
LINENUMBER (7)
RETURN
LABEL (L6)
LABEL (L5)
}
public final java.lang.String getFirstName()