Update to kotlin 1.4-RC (#2017)

* Bump kotlin version to 1.4.0-rc-154

* Migrate to the new serialization version

* Temporary disable benchmarks.

Unfortunately it isn't possible to recompile
kotlinx.benchmarks due to KT-40058. And it isn't possible to
use 1.4-M2 version because of pre-release flag.

* Update to new version of kotlinx.serialization

* Bump kotlin to 1.4.0-rc-218

* Fix cinterop publishing (#1916)

KT-39302, cherry-pich from f239813
* Add linuxX64 back to list of cross-compile targets

This change were forgotten in a41ddf2

* Hack konanTarget list of native-shared compilations

* Bump kotlin version to 1.4.0-rc

* Enable benchmarks with new version of kotlinx-benchmark (#2015)

* Revert "Temporary disable benchmarks."

This reverts commit b4ee050

* Upgrade benchmarks plugin to 0.2.0-dev-17

* Update to new serialization API

* Update public API

Co-authored-by: Stanislav Erokhin <[email protected]>
Co-authored-by: Abduqodiri Qurbonzoda <[email protected]>

Author: 3 people

gradle.properties

@@ -14,15 +14,15 @@ org.gradle.daemon=true
 org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # kotlin
-kotlin_version=1.4-M3
+kotlin_version=1.4.0-rc
 kotlin.native.ignoreDisabledTargets=true
 
 # kotlin libraries
-benchmarks_version=0.2.0-mpp-dev-5
+benchmarks_version=0.2.0-dev-17
 
-serialization_version=0.20.0-1.4-M3
-coroutines_version=1.3.7-1.4-M3
-atomicfu_version=0.14.3-1.4-M3
+serialization_version=1.0-M1-1.4.0-rc
+coroutines_version=1.3.8-1.4.0-rc
+atomicfu_version=0.14.3-1.4.0-rc
 validator_version=0.2.2
 
 # server

gradle/posix.gradle

@@ -104,3 +104,22 @@ kotlin {
 }
 
 project.ext.set("hasNative", true)
+
+
+// hack for 1.4-M2, remove after
+// see https://youtrack.jetbrains.com/issue/KT-39302
+afterEvaluate {
+    def metadataTarget = kotlin.targets.getByName("metadata")
+
+    def currentHostKonanTarget = hostManager.Companion.getHost()
+
+    if (metadataTarget != null) {
+        metadataTarget.compilations.forEach {
+            if (it.class.name == "org.jetbrains.kotlin.gradle.plugin.mpp.KotlinSharedNativeCompilation"
+                && it.konanTargets.any { it == currentHostKonanTarget }
+            ) {
+                it.kotlinOptions.freeCompilerArgs += ["-target", currentHostKonanTarget.name]
+            }
+        }
+    }
+}

ktor-client/ktor-client-features/ktor-client-json/common/test/CollectionsSerializationTest.kt

@@ -15,22 +15,22 @@ class CollectionsSerializationTest {
 
     @Test
     fun testJsonElements() {
-        testSerializer.testWrite(json {
-            "a" to "1"
-            "b" to json {
-                "c" to 3
-            }
-            "x" to JsonNull
+        testSerializer.testWrite(buildJsonObject {
+            put("a", "1")
+            put("b", buildJsonObject {
+                put("c", 3)
+            })
+            put("x", JsonNull)
         }).let { result ->
             assertEquals("""{"a":"1","b":{"c":3},"x":null}""", result)
         }
 
-        testSerializer.testWrite(json {
-            "a" to "1"
-            "b" to jsonArray {
-                +"c"
-                +JsonPrimitive(2)
-            }
+        testSerializer.testWrite(buildJsonObject {
+            put("a", "1")
+            put("b", buildJsonArray {
+                add("c")
+                add(JsonPrimitive(2))
+            })
         }).let { result ->
             assertEquals("""{"a":"1","b":["c",2]}""", result)
         }

ktor-client/ktor-client-features/ktor-client-json/ktor-client-json-tests/jvm/test/KotlinxSerializerTest.kt

@@ -20,10 +20,9 @@ class KotlinxSerializerTest {
     fun testCustomDeserializer() {
         val upwrapper = indexListUnwrapper<TestEntry>()
 
-        @OptIn(UnstableDefault::class)
         val serializer = Json {
             ignoreUnknownKeys = true
-            serialModule = serializersModule(upwrapper)
+            serializersModule = serializersModuleOf(upwrapper)
         }
 
         val kotlinxSerializer = KotlinxSerializer(serializer)
@@ -49,11 +48,10 @@ class KotlinxSerializerTest {
 @Serializable
 data class TestEntry(val a: String, val b: Int)
 
-@ImplicitReflectionSerializer
-inline fun <reified T> indexListUnwrapper() =
-    object : JsonTransformingSerializer<List<T>>(serializer<T>().list, "unwrap") {
-        override fun readTransform(element: JsonElement): JsonElement {
-            return if (element is JsonArray) element else element.jsonObject.values.firstOrNull { it is JsonArray }
-                ?: error("Collection not found in json")
-        }
+inline fun <reified T> indexListUnwrapper(
+) = object : JsonTransformingSerializer<List<T>>(ListSerializer<T>(serializer<T>())) {
+    override fun transformDeserialize(element: JsonElement): JsonElement {
+        return if (element is JsonArray) element else element.jsonObject.values.firstOrNull { it is JsonArray }
+            ?: error("Collection not found in json")
     }
+}

ktor-client/ktor-client-features/ktor-client-json/ktor-client-serialization/api/ktor-client-serialization.api

@@ -9,6 +9,7 @@ public final class io/ktor/client/features/json/serializer/KotlinxSerializer : i
 }
 
 public final class io/ktor/client/features/json/serializer/KotlinxSerializer$Companion {
-	public final fun getDefaultJsonConfiguration ()Lkotlinx/serialization/json/JsonConfiguration;
+	public final fun getDefaultJson ()Lkotlinx/serialization/json/Json;
+	public final fun getDefaultJsonConfiguration ()Lkotlinx/serialization/json/Json;
 }
 

ktor-client/ktor-client-features/ktor-client-json/ktor-client-serialization/common/src/io/ktor/client/features/json/serializer/KotlinxSerializer.kt

@@ -17,9 +17,8 @@ import kotlinx.serialization.modules.*
 /**
  * A [JsonSerializer] implemented for kotlinx [Serializable] classes.
  */
-@Suppress("EXPERIMENTAL_API_USAGE_ERROR")
 class KotlinxSerializer(
-    private val json: Json = Json(DefaultJsonConfiguration)
+    private val json: Json = DefaultJson
 ) : JsonSerializer {
 
     override fun write(data: Any, contentType: ContentType): OutgoingContent {
@@ -28,44 +27,58 @@ class KotlinxSerializer(
     }
 
     internal fun writeContent(data: Any): String =
-        json.stringify(buildSerializer(data, json.context) as KSerializer<Any>, data)
+        json.encodeToString(buildSerializer(data, json.serializersModule), data)
 
+    @OptIn(UnsafeSerializationApi::class)
     override fun read(type: TypeInfo, body: Input): Any {
         val text = body.readText()
-        val deserializationStrategy = json.context.getContextual(type.type)
+        val deserializationStrategy = json.serializersModule.getContextual(type.type)
         val mapper = deserializationStrategy ?: (type.kotlinType?.let { serializer(it) } ?: type.type.serializer())
-        return json.parse(mapper, text)!!
+        return json.decodeFromString(mapper, text)!!
     }
 
     companion object {
         /**
          * Default [Json] configuration for [KotlinxSerializer].
          */
-        val DefaultJsonConfiguration: JsonConfiguration = JsonConfiguration(
-            isLenient = false,
-            ignoreUnknownKeys = false,
-            serializeSpecialFloatingPointValues = true,
-            useArrayPolymorphism = false
+        @Deprecated(
+            level = DeprecationLevel.ERROR,
+            message = "DefaultJsonConfiguration is deprecated. Consider using DefaultJson instead."
         )
+        @Suppress("DEPRECATION_ERROR")
+        val DefaultJsonConfiguration: Json = Json {
+            isLenient = false
+            ignoreUnknownKeys = false
+            allowSpecialFloatingPointValues = true
+            useArrayPolymorphism = false
+        }
+
+        val DefaultJson: Json = Json {
+            isLenient = false
+            ignoreUnknownKeys = false
+            allowSpecialFloatingPointValues = true
+            useArrayPolymorphism = false
+        }
     }
 }
 
-@Suppress("UNCHECKED_CAST", "EXPERIMENTAL_API_USAGE_ERROR")
-private fun buildSerializer(value: Any, module: SerialModule): KSerializer<*> = when (value) {
+@Suppress("UNCHECKED_CAST")
+@OptIn(UnsafeSerializationApi::class)
+private fun buildSerializer(value: Any, module: SerializersModule): KSerializer<Any> = when (value) {
     is JsonElement -> JsonElementSerializer
-    is List<*> -> value.elementSerializer(module).list
-    is Array<*> -> value.firstOrNull()?.let { buildSerializer(it, module) } ?: String.serializer().list
-    is Set<*> -> value.elementSerializer(module).set
+    is List<*> -> ListSerializer(value.elementSerializer(module))
+    is Array<*> -> value.firstOrNull()?.let { buildSerializer(it, module) } ?: ListSerializer(String.serializer())
+    is Set<*> -> SetSerializer(value.elementSerializer(module))
     is Map<*, *> -> {
-        val keySerializer = value.keys.elementSerializer(module) as KSerializer<Any>
-        val valueSerializer = value.values.elementSerializer(module) as KSerializer<Any>
+        val keySerializer = value.keys.elementSerializer(module)
+        val valueSerializer = value.values.elementSerializer(module)
         MapSerializer(keySerializer, valueSerializer)
     }
     else -> module.getContextual(value::class) ?: value::class.serializer()
-}
+} as KSerializer<Any>
 
 @Suppress("EXPERIMENTAL_API_USAGE_ERROR")
-private fun Collection<*>.elementSerializer(module: SerialModule): KSerializer<*> {
+private fun Collection<*>.elementSerializer(module: SerializersModule): KSerializer<*> {
     val serializers: List<KSerializer<*>> =
         filterNotNull().map { buildSerializer(it, module) }.distinctBy { it.descriptor.serialName }
 

ktor-client/ktor-client-features/ktor-client-json/ktor-client-serialization/common/test/ContextualSerializationTest.kt

@@ -5,18 +5,18 @@ import io.ktor.client.call.*
 import io.ktor.client.features.json.serializer.*
 import io.ktor.utils.io.core.*
 import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.*
+import kotlinx.serialization.encoding.*
 import kotlinx.serialization.json.*
 import kotlinx.serialization.modules.*
-import kotlin.reflect.*
-import kotlin.reflect.typeOf
 import kotlin.test.*
 
 
 @Serializable
 data class UserData(val id: Int, val name: String)
 
 object UserDataSerializer : KSerializer<UserData> {
-    override val descriptor: SerialDescriptor = SerialDescriptor("UserData")
+    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("UserData")
 
     override fun deserialize(decoder: Decoder): UserData {
         val id = decoder.decodeString().toInt(16)
@@ -35,7 +35,7 @@ class ContextualSerializationTest {
     @Test
     fun testSerializationWithContext() {
         val context = serializersModuleOf(UserData::class, UserDataSerializer)
-        val contextual = KotlinxSerializer(Json(context = context))
+        val contextual = KotlinxSerializer(Json { serializersModule = context })
         val simple = KotlinxSerializer()
 
         val data = UserData(1, "kotlin")
@@ -46,7 +46,7 @@ class ContextualSerializationTest {
         assertEquals("\"1\"\"kotlin\"", contextualString)
         assertEquals("{\"id\":1,\"name\":\"kotlin\"}", simpleString)
 
-        val makeInput =  { text: String ->
+        val makeInput = { text: String ->
             buildPacket { writeText(text) }
         }
 

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/MultiPartFormDataTest.kt

@@ -9,8 +9,6 @@ import io.ktor.client.request.forms.*
 import io.ktor.client.statement.*
 import io.ktor.client.tests.utils.*
 import io.ktor.http.*
-import kotlinx.io.*
-import kotlinx.serialization.internal.*
 import kotlin.test.*
 
 /**

ktor-features/ktor-serialization/jvm/src/io/ktor/serialization/JsonSupport.kt

@@ -20,15 +20,39 @@ import kotlinx.serialization.modules.*
  *
  * See [JsonConfiguration] for more details.
  */
-val DefaultJsonConfiguration: JsonConfiguration = JsonConfiguration.Stable.copy(
-    encodeDefaults = true,
-    isLenient = true,
-    serializeSpecialFloatingPointValues = true,
-    allowStructuredMapKeys = true,
-    unquotedPrint = false,
-    prettyPrint = false,
-    useArrayPolymorphism = true
+@Deprecated(
+    level = DeprecationLevel.ERROR,
+    message = "JsonConfiguration is deprecated, consider using DefaultJson instead.",
+    replaceWith = ReplaceWith("DefaultJson")
 )
+@Suppress("DEPRECATION_ERROR")
+val DefaultJsonConfiguration: Json = Json {
+    encodeDefaults = true
+    isLenient = true
+    allowSpecialFloatingPointValues = true
+    allowStructuredMapKeys = true
+    prettyPrint = false
+    useArrayPolymorphism = true
+}
+
+/**
+ * The default json configuration used in [SerializationConverter]. The settings are:
+ * - defaults are serialized
+ * - mode is not strict so extra json fields are ignored
+ * - pretty printing is disabled
+ * - array polymorphism is enabled
+ * - keys and values are quoted, non-quoted are not allowed
+ *
+ * See [JsonConfiguration] for more details.
+ */
+val DefaultJson: Json = Json {
+    encodeDefaults = true
+    isLenient = true
+    allowSpecialFloatingPointValues = true
+    allowStructuredMapKeys = true
+    prettyPrint = false
+    useArrayPolymorphism = true
+}
 
 /**
  * Register `application/json` (or another specified [contentType]) content type
@@ -38,12 +62,18 @@ val DefaultJsonConfiguration: JsonConfiguration = JsonConfiguration.Stable.copy(
  * @param module is used for serialization (optional)
  * @param contentType to register with, application/json by default
  */
+@Deprecated(
+    level = DeprecationLevel.ERROR,
+    message = "JsonConfiguration is deprecated, consider using `Json { serializersModule = module }` instead.",
+    replaceWith = ReplaceWith("json(Json { serializersModule = module }, contentType)")
+)
+@Suppress("DEPRECATION_ERROR")
 fun ContentNegotiation.Configuration.json(
-    json: JsonConfiguration = DefaultJsonConfiguration,
-    module: SerialModule = EmptyModule,
+    json: Json = Json.Default,
+    module: SerializersModule = EmptySerializersModule,
     contentType: ContentType = ContentType.Application.Json
 ) {
-    json(Json(json, module), contentType)
+    TODO()
 }
 
 /**
@@ -54,7 +84,7 @@ fun ContentNegotiation.Configuration.json(
  * @param contentType to register with, application/json by default
  */
 fun ContentNegotiation.Configuration.json(
-    json: Json = Json(DefaultJsonConfiguration),
+    json: Json = DefaultJson,
     contentType: ContentType = ContentType.Application.Json
 ) {
     serialization(contentType, json as StringFormat)