Update to -release-150

Kotlin · Dec 24, 2020 · e5bdea8 · e5bdea8
1 parent f300bc5
commit e5bdea8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/core/api/kotlinx-serialization-core.api b/core/api/kotlinx-serialization-core.api
@@ -1101,37 +1101,37 @@ public final class kotlinx/serialization/internal/TripleSerializer : kotlinx/ser
 public final class kotlinx/serialization/internal/UByteSerializer : kotlinx/serialization/KSerializer {
 	public static final field INSTANCE Lkotlinx/serialization/internal/UByteSerializer;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun deserialize-w2LRezQ (Lkotlinx/serialization/encoding/Decoder;)B
+	public fun deserialize-Wa3L5BU (Lkotlinx/serialization/encoding/Decoder;)B
 	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun serialize-gatcVwo (Lkotlinx/serialization/encoding/Encoder;B)V
+	public fun serialize-EK-6454 (Lkotlinx/serialization/encoding/Encoder;B)V
 }
 
 public final class kotlinx/serialization/internal/UIntSerializer : kotlinx/serialization/KSerializer {
 	public static final field INSTANCE Lkotlinx/serialization/internal/UIntSerializer;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun deserialize-pVg5ArA (Lkotlinx/serialization/encoding/Decoder;)I
+	public fun deserialize-OGnWXxg (Lkotlinx/serialization/encoding/Decoder;)I
 	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun serialize-8Zurfog (Lkotlinx/serialization/encoding/Encoder;I)V
+	public fun serialize-Qn1smSk (Lkotlinx/serialization/encoding/Encoder;I)V
 }
 
 public final class kotlinx/serialization/internal/ULongSerializer : kotlinx/serialization/KSerializer {
 	public static final field INSTANCE Lkotlinx/serialization/internal/ULongSerializer;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun deserialize-s-VKNKU (Lkotlinx/serialization/encoding/Decoder;)J
+	public fun deserialize-I7RO_PI (Lkotlinx/serialization/encoding/Decoder;)J
 	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun serialize-5zp7Ths (Lkotlinx/serialization/encoding/Encoder;J)V
+	public fun serialize-2TYgG_w (Lkotlinx/serialization/encoding/Encoder;J)V
 }
 
 public final class kotlinx/serialization/internal/UShortSerializer : kotlinx/serialization/KSerializer {
 	public static final field INSTANCE Lkotlinx/serialization/internal/UShortSerializer;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun deserialize-Mh2AYeg (Lkotlinx/serialization/encoding/Decoder;)S
+	public fun deserialize-BwKQO78 (Lkotlinx/serialization/encoding/Decoder;)S
 	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun serialize-xk1WQFo (Lkotlinx/serialization/encoding/Encoder;S)V
+	public fun serialize-i8woANY (Lkotlinx/serialization/encoding/Encoder;S)V
 }
 
 public final class kotlinx/serialization/internal/UnitSerializer : kotlinx/serialization/KSerializer {

diff --git a/formats/json/commonTest/src/kotlinx/serialization/test/TestHelpers.kt b/formats/json/commonTest/src/kotlinx/serialization/test/TestHelpers.kt
@@ -36,10 +36,6 @@ inline fun jvmOnly(test: () -> Unit) {
     if (isJvm()) test()
 }
 
-inline fun noLegacyJs(test: () -> Unit) {
-    if (!isJsLegacy()) test()
-}
-
 inline fun assertFailsWithMissingField(block: () -> Unit) {
     val e = assertFailsWith<SerializationException>(block = block)
     assertTrue(e.message?.contains("but it was missing") ?: false)

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@
 group=org.jetbrains.kotlinx
 version=1.1.0-SNAPSHOT
 
-kotlin.version=1.4.30-M1
+kotlin.version=1.4.30-M1-release-150
 
 # This version take precedence if 'bootstrap' property passed to project
 kotlin.version.snapshot=1.4.255-SNAPSHOT

diff --git a/integration-test/gradle.properties b/integration-test/gradle.properties
@@ -2,7 +2,7 @@
 # Copyright 2017-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
 #
 
-mainKotlinVersion=1.4.30-M1
+mainKotlinVersion=1.4.30-M1-release-150
 mainLibVersion=1.1.0-SNAPSHOT
 
 kotlin.code.style=official