184 files changed, 544 insertions, 456 deletions

diff --git a/benchmark/build.gradle b/benchmark/build.gradle
index cad8cc9c..8b9d3f28 100644
--- a/benchmark/build.gradle
+++ b/benchmark/build.gradle
@@ -17,9 +17,9 @@ jmhJar {
 }
 
 dependencies {
-    apt 'com.google.auto.value:auto-value:1.4.1'
-    apt 'com.ryanharter.auto.value:auto-value-gson:0.4.6'
-    apt 'com.ryanharter.auto.value:auto-value-moshi:0.4.3'
+    annotationProcessor 'com.google.auto.value:auto-value:1.4.1'
+    annotationProcessor 'com.ryanharter.auto.value:auto-value-gson:0.4.6'
+    annotationProcessor 'com.ryanharter.auto.value:auto-value-moshi:0.4.3'
 
     compileOnly 'com.google.auto.value:auto-value:1.4.1'
     compileOnly 'com.ryanharter.auto.value:auto-value-gson:0.4.6'
@@ -33,7 +33,7 @@ dependencies {
     compile 'com.google.code.gson:gson:2.8.1'
     compile 'com.esotericsoftware:kryo:4.0.0'
 
-    compile project(':jvm')
+    compile project(':runtime')
 
     // async profiler
     compile group: 'pl.project13.scala', name: 'sbt-jmh-extras', version: '0.3.3'
diff --git a/build.gradle b/build.gradle
index 94ec4a9e..5055c50a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,25 +3,12 @@
  */
 
 buildscript {
-    def deployNative = property('native.deploy') == 'true'
-
     if (project.hasProperty("bootstrap")) {
-        ext.compilerVersion = property('kotlin.version.snapshot')
-        ext.librariesVersion = property('kotlin.version.snapshot')
-        ext.serializationPluginVersion = property('plugin.version.snapshot')
-        ext.konanVersion = property('konan.version.snapshot')
+        ext.kotlin_version = property('kotlin.version.snapshot')
         ext["org.jetbrains.kotlin.native.home"] = System.getenv("KONAN_LOCAL_DIST")
     } else {
-        ext.compilerVersion = property('kotlin.version')
-        ext.librariesVersion = property('kotlin.version')
-        ext.serializationPluginVersion = property('plugin.version')
-        ext.konanVersion = property('konan.version')
+        ext.kotlin_version = property('kotlin.version')
     }
-    ext.serializationVersion = property('library.version')
-    ext.serializationCoordinates = "org.jetbrains.kotlin:kotlin-serialization"
-    ext.tcChannel = 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/id:2082584/artifacts/content/maven'
-    ext.devChannel = 'https://kotlin.bintray.com/kotlin-dev'
-    ext.serializationRepo = 'https://kotlin.bintray.com/kotlinx'
     ext.experimentalsEnabled = ["-progressive", "-Xuse-experimental=kotlin.Experimental",
                                 "-Xuse-experimental=kotlin.ExperimentalMultiplatform",
     ]
@@ -34,47 +21,45 @@ buildscript {
 
     repositories {
         mavenLocal()
-        maven { url tcChannel }
-        maven { url devChannel }
-        maven { url serializationRepo }
-        maven { url "https://plugins.gradle.org/m2/" }
+        maven { url 'https://kotlin.bintray.com/kotlin-dev' }
+        maven { url 'https://kotlin.bintray.com/kotlin-eap' }
+        maven { url 'https://kotlin.bintray.com/kotlinx' }
+        maven { url "https://dl.bintray.com/orangy/maven" }
         maven { url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies" }
         jcenter()
+        gradlePluginPortal()
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$compilerVersion"
-        classpath "$serializationCoordinates:$serializationPluginVersion"
-        classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:$konanVersion"
-
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.2'
-
-        // Custom bintray plugin to publish with Gradle Metadata
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4-jetbrains-3"
-
-        classpath "com.github.jengelman.gradle.plugins:shadow:2.0.2"
-        classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.5"
-        classpath "net.ltgt.gradle:gradle-apt-plugin:0.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "kotlinx.team:kotlinx.team.infra:$infra_version"
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray_version"
+
+        // Protobuf is udes in JVM tests
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8'
+
+        // Various benchmarking stuff
+        classpath "com.github.jengelman.gradle.plugins:shadow:4.0.2"
+        classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.8"
+        classpath "net.ltgt.gradle:gradle-apt-plugin:0.21"
     }
 }
 
-ext {
-    libraries = [
-            kotlin_stdlib: "org.jetbrains.kotlin:kotlin-stdlib:$librariesVersion",
-            kotlin_stdlib_common: "org.jetbrains.kotlin:kotlin-stdlib-common:$librariesVersion",
-            kotlin_stdlib_js: "org.jetbrains.kotlin:kotlin-stdlib-js:$librariesVersion",
-            kotlin_test: "org.jetbrains.kotlin:kotlin-test:$librariesVersion",
-            kotlin_test_junit: "org.jetbrains.kotlin:kotlin-test-junit:$librariesVersion",
-            kotlin_test_common: "org.jetbrains.kotlin:kotlin-test-common:$librariesVersion",
-            kotlin_test_annotations_common: "org.jetbrains.kotlin:kotlin-test-annotations-common:$librariesVersion",
-            kotlin_test_js: "org.jetbrains.kotlin:kotlin-test-js:$librariesVersion",
-            kotlin_reflect: "org.jetbrains.kotlin:kotlin-reflect:$librariesVersion",
-    ]
+apply plugin: 'kotlinx.team.infra'
+
+infra {
+    teamcity {}
+    node {
+        version = '10.15.1'
+        mocha('4.1.0')
+        install("source-map-support", "0.5.3")
+        install("mocha-teamcity-reporter", "2.2.2")
+    }
 }
 
 allprojects {
     group 'org.jetbrains.kotlinx'
-    version serializationVersion
 
     if (project.hasProperty("bootstrap")) {
         version = version + '-SNAPSHOT'
@@ -82,29 +67,14 @@ allprojects {
 
     repositories {
         mavenLocal()
-        maven { url tcChannel }
-        maven { url devChannel }
-        maven { url serializationRepo }
         jcenter()
+        maven { url "https://dl.bintray.com/kotlin/kotlinx" }
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
+        maven { url "https://dl.bintray.com/kotlin/kotlin-eap" }
     }
 }
 
-apply plugin: 'kotlin'
-
 subprojects {
-    configurations.all {
-        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-            if (details.requested.group == 'org.jetbrains.kotlin' && details.requested.name == 'kotlinx-serialization-unshaded') {
-                details.useVersion serializationPluginVersion
-                details.because 'use not bundled one'
-            }
-        }
-    }
-
-    if (project.name.contains("native")) return
-
-    apply plugin: 'kotlinx-serialization'
-
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile).all { task ->
         if (task.name.contains("Test") || task.name.contains("Jmh")) {
             task.kotlinOptions.freeCompilerArgs += experimentalsInTestEnabled
@@ -113,69 +83,12 @@ subprojects {
         }
     }
 
+    // Configure publishing for some artifacts
     if (project.name.contains("benchmark")) return
 
-    apply plugin: 'maven-publish'
-
-    def varintName = ""
-
-    if (project.name == "jvm") {
-        varintName = "${rootProject.name}"
-    } else {
-        varintName = "${rootProject.name}-${project.name}"
-    }
-
-    afterEvaluate {
-        task sourceJar(type: Jar, dependsOn: classes) {
-            classifier 'sources'
-            from sourceSets.main.kotlin
-            if (project.name == "jvm" || project.name == "js") {
-                duplicatesStrategy = "exclude"
-                def platformSrc = sourceSets.main.kotlin
-                def commonSrc = project(':common').sourceSets.main.kotlin
-                from(platformSrc + commonSrc)
-            }
-        }
-    }
-
-    tasks.withType(Jar) {
-        archivesBaseName = varintName
-    }
-
-    apply from: "${rootProject.rootDir}/gradle/mavenMetadata.gradle"
-
-    publishing {
-        publications {
-            mavenProject(MavenPublication) {
-                from components.java
-                groupId project.group
-                artifactId varintName
-                version project.version
-
-                artifact sourceJar {
-                    classifier "sources"
-                }
-                pom.withXml {
-                    def root = it.asNode()
-                    // NOTE: Don't try to move top-level things (especially "description") to the pomConfig block
-                    //       because they would resolve incorrectly to top-level project properties in Gradle/Groovy
-                    root.appendNode('name', varintName)
-                    root.appendNode('description', 'Kotlin multiplatform serialization runtime library')
-                    root.appendNode('url', 'https://github.com/Kotlin/kotlinx.serialization')
-                    root.children().last() + pomConfig
-                }
-            }
-        }
-    }
-
-    apply plugin: 'com.jfrog.bintray'
-
-    apply from: "${rootProject.rootDir}/gradle/bintray.gradle"
+    apply from: rootProject.file('gradle/publishing.gradle')
+}
 
-    // Disable metadata for non-native modules
-    afterEvaluate {
-        publishing.publications.each { pub ->
-            pub.moduleDescriptorGenerator = null
-        }
-    }
+afterEvaluate {
+    println("Using Kotlin compiler version: $org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION")
 }
diff --git a/build.gradle.old b/build.gradle.old
new file mode 100644
index 00000000..94ec4a9e
--- /dev/null
+++ b/build.gradle.old
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2017-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+buildscript {
+    def deployNative = property('native.deploy') == 'true'
+
+    if (project.hasProperty("bootstrap")) {
+        ext.compilerVersion = property('kotlin.version.snapshot')
+        ext.librariesVersion = property('kotlin.version.snapshot')
+        ext.serializationPluginVersion = property('plugin.version.snapshot')
+        ext.konanVersion = property('konan.version.snapshot')
+        ext["org.jetbrains.kotlin.native.home"] = System.getenv("KONAN_LOCAL_DIST")
+    } else {
+        ext.compilerVersion = property('kotlin.version')
+        ext.librariesVersion = property('kotlin.version')
+        ext.serializationPluginVersion = property('plugin.version')
+        ext.konanVersion = property('konan.version')
+    }
+    ext.serializationVersion = property('library.version')
+    ext.serializationCoordinates = "org.jetbrains.kotlin:kotlin-serialization"
+    ext.tcChannel = 'https://teamcity.jetbrains.com/guestAuth/app/rest/builds/id:2082584/artifacts/content/maven'
+    ext.devChannel = 'https://kotlin.bintray.com/kotlin-dev'
+    ext.serializationRepo = 'https://kotlin.bintray.com/kotlinx'
+    ext.experimentalsEnabled = ["-progressive", "-Xuse-experimental=kotlin.Experimental",
+                                "-Xuse-experimental=kotlin.ExperimentalMultiplatform",
+    ]
+
+    ext.experimentalsInTestEnabled = ["-progressive", "-Xuse-experimental=kotlin.Experimental",
+                                      "-Xuse-experimental=kotlin.ExperimentalMultiplatform",
+                                      "-Xuse-experimental=kotlinx.serialization.ImplicitReflectionSerializer",
+                                      "-Xuse-experimental=kotlinx.serialization.UnstableDefault"
+    ]
+
+    repositories {
+        mavenLocal()
+        maven { url tcChannel }
+        maven { url devChannel }
+        maven { url serializationRepo }
+        maven { url "https://plugins.gradle.org/m2/" }
+        maven { url "https://dl.bintray.com/jetbrains/kotlin-native-dependencies" }
+        jcenter()
+    }
+
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$compilerVersion"
+        classpath "$serializationCoordinates:$serializationPluginVersion"
+        classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:$konanVersion"
+
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.2'
+
+        // Custom bintray plugin to publish with Gradle Metadata
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4-jetbrains-3"
+
+        classpath "com.github.jengelman.gradle.plugins:shadow:2.0.2"
+        classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.5"
+        classpath "net.ltgt.gradle:gradle-apt-plugin:0.10"
+    }
+}
+
+ext {
+    libraries = [
+            kotlin_stdlib: "org.jetbrains.kotlin:kotlin-stdlib:$librariesVersion",
+            kotlin_stdlib_common: "org.jetbrains.kotlin:kotlin-stdlib-common:$librariesVersion",
+            kotlin_stdlib_js: "org.jetbrains.kotlin:kotlin-stdlib-js:$librariesVersion",
+            kotlin_test: "org.jetbrains.kotlin:kotlin-test:$librariesVersion",
+            kotlin_test_junit: "org.jetbrains.kotlin:kotlin-test-junit:$librariesVersion",
+            kotlin_test_common: "org.jetbrains.kotlin:kotlin-test-common:$librariesVersion",
+            kotlin_test_annotations_common: "org.jetbrains.kotlin:kotlin-test-annotations-common:$librariesVersion",
+            kotlin_test_js: "org.jetbrains.kotlin:kotlin-test-js:$librariesVersion",
+            kotlin_reflect: "org.jetbrains.kotlin:kotlin-reflect:$librariesVersion",
+    ]
+}
+
+allprojects {
+    group 'org.jetbrains.kotlinx'
+    version serializationVersion
+
+    if (project.hasProperty("bootstrap")) {
+        version = version + '-SNAPSHOT'
+    }
+
+    repositories {
+        mavenLocal()
+        maven { url tcChannel }
+        maven { url devChannel }
+        maven { url serializationRepo }
+        jcenter()
+    }
+}
+
+apply plugin: 'kotlin'
+
+subprojects {
+    configurations.all {
+        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+            if (details.requested.group == 'org.jetbrains.kotlin' && details.requested.name == 'kotlinx-serialization-unshaded') {
+                details.useVersion serializationPluginVersion
+                details.because 'use not bundled one'
+            }
+        }
+    }
+
+    if (project.name.contains("native")) return
+
+    apply plugin: 'kotlinx-serialization'
+
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile).all { task ->
+        if (task.name.contains("Test") || task.name.contains("Jmh")) {
+            task.kotlinOptions.freeCompilerArgs += experimentalsInTestEnabled
+        } else {
+            task.kotlinOptions.freeCompilerArgs += experimentalsEnabled
+        }
+    }
+
+    if (project.name.contains("benchmark")) return
+
+    apply plugin: 'maven-publish'
+
+    def varintName = ""
+
+    if (project.name == "jvm") {
+        varintName = "${rootProject.name}"
+    } else {
+        varintName = "${rootProject.name}-${project.name}"
+    }
+
+    afterEvaluate {
+        task sourceJar(type: Jar, dependsOn: classes) {
+            classifier 'sources'
+            from sourceSets.main.kotlin
+            if (project.name == "jvm" || project.name == "js") {
+                duplicatesStrategy = "exclude"
+                def platformSrc = sourceSets.main.kotlin
+                def commonSrc = project(':common').sourceSets.main.kotlin
+                from(platformSrc + commonSrc)
+            }
+        }
+    }
+
+    tasks.withType(Jar) {
+        archivesBaseName = varintName
+    }
+
+    apply from: "${rootProject.rootDir}/gradle/mavenMetadata.gradle"
+
+    publishing {
+        publications {
+            mavenProject(MavenPublication) {
+                from components.java
+                groupId project.group
+                artifactId varintName
+                version project.version
+
+                artifact sourceJar {
+                    classifier "sources"
+                }
+                pom.withXml {
+                    def root = it.asNode()
+                    // NOTE: Don't try to move top-level things (especially "description") to the pomConfig block
+                    //       because they would resolve incorrectly to top-level project properties in Gradle/Groovy
+                    root.appendNode('name', varintName)
+                    root.appendNode('description', 'Kotlin multiplatform serialization runtime library')
+                    root.appendNode('url', 'https://github.com/Kotlin/kotlinx.serialization')
+                    root.children().last() + pomConfig
+                }
+            }
+        }
+    }
+
+    apply plugin: 'com.jfrog.bintray'
+
+    apply from: "${rootProject.rootDir}/gradle/bintray.gradle"
+
+    // Disable metadata for non-native modules
+    afterEvaluate {
+        publishing.publications.each { pub ->
+            pub.moduleDescriptorGenerator = null
+        }
+    }
+}
diff --git a/formats/config/build.gradle b/formats/config/build.gradle
index d1c2541e..a4d7af25 100644
--- a/formats/config/build.gradle
+++ b/formats/config/build.gradle
@@ -18,10 +18,10 @@ apply plugin: 'kotlin'
 apply plugin: 'kotlinx-serialization'
 
 dependencies {
-    compile project(':jvm')
-    compile libraries.kotlin_stdlib
+    compile project(':runtime')
+    api 'org.jetbrains.kotlin:kotlin-stdlib'
 
-    compile 'com.typesafe:config:1.3.2'
+    api 'com.typesafe:config:1.3.2'
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
-}
\ No newline at end of file
+}
diff --git a/gradle.properties b/gradle.properties
index d8751b13..c83a20d2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,32 +1,27 @@
 #
-# Copyright 2018 JetBrains s.r.o.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Copyright 2017-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
 #
 
-library.version=0.11.0
+group=org.jetbrains.kotlinx
+version=0.11.1
+
 kotlin.version=1.3.30
+
+# This version take precedence if 'bootstrap' property passed to project
 kotlin.version.snapshot=1.3-SNAPSHOT
-plugin.version=1.3.30
-plugin.version.snapshot=1.3-SNAPSHOT
-konan.version=1.3.30
-konan.version.snapshot=1.3-SNAPSHOT-native-1.2.0-dev
-# Also set KONAN_LOCAL_DIST enviroment variable to auto-assign konan.home
+# Also set KONAN_LOCAL_DIST enviroment variable in bootstrap mode to auto-assign konan.home
+
+junit_version=4.12
+infra_version=0.1.0-dev-42
+bintray_version=1.8.4-jetbrains-5
+benchmarks_version=0.1.7-dev-14
 
 native.deploy=false
 
+kotlin.parallel.tasks.in.project=true
+kotlin.incremental.multiplatform=true
 org.gradle.parallel=true
 org.gradle.caching=false
 
 org.jetbrains.kotlin.native.jvmArgs=-XX:TieredStopAtLevel=1
-#konan.jvmArgs=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5007
+#org.jetbrains.kotlin.native.jvmArgs=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5007
diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle
index d5f635c0..66b1f294 100644
--- a/gradle/bintray.gradle
+++ b/gradle/bintray.gradle
@@ -1,23 +1,11 @@
 /*
- * Copyright 2018 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2017-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
 bintray {
     user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
     key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
-    publications = ['mavenProject']
+    publications = ['maven']
     publish = false
     override = true
     pkg {
diff --git a/gradle/mavenMetadata.gradle b/gradle/mavenMetadata.gradle
index 979855a6..5e4148cc 100644
--- a/gradle/mavenMetadata.gradle
+++ b/gradle/mavenMetadata.gradle
@@ -1,17 +1,5 @@
 /*
- * Copyright 2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2017-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
 project.ext.pomConfig = {
@@ -35,3 +23,11 @@ project.ext.pomConfig = {
         url "https://github.com/Kotlin/kotlinx.serialization"
     }
 }
+
+project.ext.configureMavenCentralMetadata = { pom ->
+    def root = asNode()
+    root.appendNode('name', project.name)
+    root.appendNode('description', 'Kotlin multiplatform serialization runtime library')
+    root.appendNode('url', 'https://github.com/Kotlin/kotlinx.serialization')
+    root.children().last() + pomConfig
+}
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
new file mode 100644
index 00000000..ea3cac0b
--- /dev/null
+++ b/gradle/publishing.gradle
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2017-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+// Configures publishing of Maven artifacts to Bintray
+
+apply plugin: 'maven'
+apply plugin: 'maven-publish'
+apply plugin: 'com.jfrog.bintray'
+
+apply from: project.rootProject.file('gradle/mavenMetadata.gradle')
+
+def isMultiplatform = project.name == "runtime"
+def isCoreRuntime   = project.name == "runtime"
+
+task stubSources(type: Jar) {
+    classifier = 'sources'
+}
+
+task stubJavadoc(type: Jar) {
+    classifier = 'javadoc'
+}
+
+task emptyJar(type: Jar) {
+}
+
+afterEvaluate {
+    task sourcesJar(type: Jar) {
+        classifier = 'sources'
+        if (isMultiplatform) {
+            from kotlin.sourceSets.commonMain.kotlin
+        } else {
+            from sourceSets.main.allSource
+        }
+    }
+}
+
+afterEvaluate {
+    publishing {
+        def variantName = ""
+
+        if (isCoreRuntime) {
+            variantName = "${rootProject.name}"
+        } else {
+            variantName = "${rootProject.name}-${project.name}"
+        }
+
+        if (!isMultiplatform) {
+            publications {
+                maven(MavenPublication) { publication ->
+                    artifactId variantName
+                    publication.from components.java
+//                    publication.artifact stubJavadoc // todo
+                    publication.artifact sourcesJar
+                    publication.pom.withXml(configureMavenCentralMetadata)
+                }
+            }
+
+            disableMetadataPublicationKotlinJvm()
+            return
+        }
+
+        // Rename artifacts for backward compatibility
+        publications.all {
+            def type = it.name
+//            println("Configuring $type")
+            switch (type) {
+                case 'kotlinMultiplatform':
+                    it.artifactId = "$variantName-native"
+                    it.artifact emptyJar
+//                    it.artifact stubJavadoc
+                    it.artifact sourcesJar
+                    break
+
+                case 'metadata':
+                    it.artifactId = "$variantName-common"
+                    break
+
+                case 'jvm':
+                    it.artifactId = "$variantName"
+                    break
+
+                default:
+                    it.artifactId = "$variantName-$type"
+                    break
+            }
+//            println("Artifact id = ${it.artifactId}")
+
+            pom.withXml(configureMavenCentralMetadata)
+        }
+
+        disableMetadataPublication()
+    }
+}
+
+private void disableMetadataPublicationKotlinJvm() {
+    publishing.publications.each { pub ->
+        pub.moduleDescriptorGenerator = null
+        tasks.matching { it.name == "generateMetadataFileFor${pub.name.capitalize()}Publication" }.all {
+            onlyIf { false }
+        }
+    }
+}
+
+private void disableMetadataPublication() {
+    kotlin.targets.all { target ->
+        def publication = publishing.publications.findByName(target.name)
+
+        if (publication != null) {
+//            publication.artifact stubJavadoc
+            if (target.platformType.name != 'native') {
+                publication.moduleDescriptorGenerator = null
+                tasks.matching { it.name == "generateMetadataFileFor${name.capitalize()}Publication" }.all {
+                    onlyIf { false }
+                }
+            } else {
+                publication.artifact emptyJar
+            }
+        }
+    }
+}
+
+
+apply from: project.rootProject.file("gradle/bintray.gradle")
+
+// This is required for K/N publishing
+bintrayUpload.dependsOn publishToMavenLocal
+
+// This is for easier debugging of bintray uploading problems
+bintrayUpload.doFirst {
+    publications = project.publishing.publications.findAll { !it.name.contains('-test') }.collect {
+        println("Uploading artifact '$it.groupId:$it.artifactId:$it.version' from publication '$it.name'")
+        it
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 115e6ac0..6b3851a8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/integration-test/gradle.properties b/integration-test/gradle.properties
index 78f7770e..301238dc 100644
--- a/integration-test/gradle.properties
+++ b/integration-test/gradle.properties
@@ -1,4 +1,4 @@
-mainKotlinVersion=1.3.30
+mainKotlinVersion=1.3.31-release-196
 mainLibVersion=0.11.0
 
 kotlin.code.style=official
diff --git a/runtime/build.gradle b/runtime/build.gradle
new file mode 100644
index 00000000..0bb0712d
--- /dev/null
+++ b/runtime/build.gradle
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2017-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+apply plugin: 'java' // Needed for protobuf plugin only
+
+apply plugin: 'kotlin-multiplatform'
+apply plugin: 'kotlinx-serialization'
+
+ext {
+    jacksonVersion = '2.9.1'
+}
+
+// Protobuf plugin used in tests
+
+apply plugin: 'com.google.protobuf'
+
+protobuf {
+    protoc {
+        // Download from repositories
+        artifact = 'com.google.protobuf:protoc:3.0.0'
+    }
+}
+
+clean {
+    delete protobuf.generatedFilesBaseDir
+}
+
+def deployMode = property('native.deploy') == 'true'
+
+kotlin {
+    infra {
+        target('macosX64')
+        target('linuxX64')
+        if (deployMode) {
+            target('mingwX64')
+            target('iosArm64')
+            target('iosArm32')
+            target('iosX64')
+        }
+    }
+
+    targets {
+        fromPreset(presets.jvmWithJava, 'jvm') {
+            configure([compilations.main, compilations.test]) {
+                kotlinOptions {
+                    jvmTarget = '1.6'
+                }
+            }
+        }
+        fromPreset(presets.js, 'js') {
+            configure([compilations.main, compilations.test]) {
+                kotlinOptions {
+                    sourceMap = true
+                    moduleKind = "umd"
+                    metaInfo = true
+                }
+            }
+        }
+    }
+
+    sourceSets.all {
+        kotlin.srcDirs = ["$it.name/src"]
+        resources.srcDirs = ["$it.name/resources"]
+        languageSettings {
+            progressiveMode = true
+            useExperimentalAnnotation("kotlin.Experimental")
+            useExperimentalAnnotation("kotlin.ExperimentalMultiplatform")
+        }
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                api "org.jetbrains.kotlin:kotlin-stdlib"
+            }
+        }
+
+        commonTest {
+            dependencies {
+                api 'org.jetbrains.kotlin:kotlin-test-common'
+            }
+        }
+
+        jvmJsTest {
+            dependsOn commonTest
+
+            dependencies {
+                api 'org.jetbrains.kotlin:kotlin-test-common'
+                api 'org.jetbrains.kotlin:kotlin-test-annotations-common'
+            }
+        }
+
+        jvmMain {
+            dependencies {
+                api 'org.jetbrains.kotlin:kotlin-stdlib'
+            }
+        }
+        jvmTest {
+            dependsOn jvmJsTest
+
+            kotlin.srcDirs += file("${protobuf.generatedFilesBaseDir}/test/java")
+
+            dependencies {
+                api 'org.jetbrains.kotlin:kotlin-test-junit'
+                implementation 'io.kotlintest:kotlintest:2.0.4'
+
+                implementation 'com.google.protobuf:protobuf-java:3.0.0'
+                implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: jacksonVersion
+                implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
+                implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: jacksonVersion
+                implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: jacksonVersion
+                implementation group: 'com.google.code.gson', name: 'gson', version: '2.7'
+            }
+        }
+
+        jsMain {
+            dependencies {
+                api 'org.jetbrains.kotlin:kotlin-stdlib-js'
+            }
+        }
+
+        jsTest {
+            dependsOn jvmJsTest
+
+            dependencies {
+                api 'org.jetbrains.kotlin:kotlin-test-js'
+            }
+        }
+
+        nativeMain.dependencies {
+        }
+    }
+
+    sourceSets.findAll({ it.name.contains("Test") }).forEach { srcSet ->
+        srcSet.languageSettings {
+            it.useExperimentalAnnotation("kotlinx.serialization.UnstableDefault")
+
+            if (srcSet.name.contains("jvm") || srcSet.name.contains("js")) {
+                it.useExperimentalAnnotation("kotlinx.serialization.ImplicitReflectionSerializer")
+            }
+        }
+    }
+}
+
+sourceSets.test.proto {
+    srcDirs = ['testProto']
+}
+
+compileTestKotlinJvm {
+    dependsOn 'generateTestProto'
+}
diff --git a/runtime/common/build.gradle b/runtime/common/build.gradle
deleted file mode 100644
index 7b83ad3e..00000000
--- a/runtime/common/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-apply plugin: 'kotlin-platform-common'
-
-dependencies {
-    compile libraries.kotlin_stdlib_common
-
-    testCompile libraries.kotlin_test_annotations_common
-    testCompile libraries.kotlin_test_common
-}
-
-sourceSets.test.kotlin.srcDirs += ['src/testWithNative']
diff --git a/runtime/common/src/main/kotlin/kotlinx/io/Buffers.kt b/runtime/commonMain/src/kotlinx/io/Buffers.kt
index 86401b63..86401b63 100644
--- a/runtime/common/src/main/kotlin/kotlinx/io/Buffers.kt
+++ b/runtime/commonMain/src/kotlinx/io/Buffers.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/io/Streams.kt b/runtime/commonMain/src/kotlinx/io/Streams.kt
index ce67488e..ce67488e 100644
--- a/runtime/common/src/main/kotlin/kotlinx/io/Streams.kt
+++ b/runtime/commonMain/src/kotlinx/io/Streams.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/io/Writers.kt b/runtime/commonMain/src/kotlinx/io/Writers.kt
index f1e47289..f1e47289 100644
--- a/runtime/common/src/main/kotlin/kotlinx/io/Writers.kt
+++ b/runtime/commonMain/src/kotlinx/io/Writers.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/Annotations.kt b/runtime/commonMain/src/kotlinx/serialization/Annotations.kt
index d28b34fb..d28b34fb 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/Annotations.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/Annotations.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/Coders.kt b/runtime/commonMain/src/kotlinx/serialization/Coders.kt
index 3aeaf5c9..3aeaf5c9 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/Coders.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/Coders.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/ContextSerializer.kt b/runtime/commonMain/src/kotlinx/serialization/ContextSerializer.kt
index d69b66c1..d69b66c1 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/ContextSerializer.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/ContextSerializer.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/Core.kt b/runtime/commonMain/src/kotlinx/serialization/Core.kt
index 9cbc9995..9cbc9995 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/Core.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/Core.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/Deprecated.kt b/runtime/commonMain/src/kotlinx/serialization/Deprecated.kt
index a8e62a9b..a8e62a9b 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/Deprecated.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/Deprecated.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/Descriptors.kt b/runtime/commonMain/src/kotlinx/serialization/Descriptors.kt
index ac98f108..ac98f108 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/Descriptors.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/Descriptors.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/ElementWise.kt b/runtime/commonMain/src/kotlinx/serialization/ElementWise.kt
index 9257ac8a..9257ac8a 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/ElementWise.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/ElementWise.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/Exceptions.kt b/runtime/commonMain/src/kotlinx/serialization/Exceptions.kt
index 06b1b74a..06b1b74a 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/Exceptions.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/Exceptions.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/Mapper.kt b/runtime/commonMain/src/kotlinx/serialization/Mapper.kt
index 3a0fb9ff..3a0fb9ff 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/Mapper.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/Mapper.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/PlatformUtils.kt b/runtime/commonMain/src/kotlinx/serialization/PlatformUtils.kt
index f3a39015..f3a39015 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/PlatformUtils.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/PlatformUtils.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/Polymorphic.kt b/runtime/commonMain/src/kotlinx/serialization/Polymorphic.kt
index 386b1349..386b1349 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/Polymorphic.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/Polymorphic.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/SerialFormat.kt b/runtime/commonMain/src/kotlinx/serialization/SerialFormat.kt
index 53435958..53435958 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/SerialFormat.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/SerialFormat.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/SerialImplicits.kt b/runtime/commonMain/src/kotlinx/serialization/SerialImplicits.kt
index ceb00bbd..ceb00bbd 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/SerialImplicits.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/SerialImplicits.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/Shorthands.kt b/runtime/commonMain/src/kotlinx/serialization/Shorthands.kt
index 12d0c300..12d0c300 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/Shorthands.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/Shorthands.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/Tagged.kt b/runtime/commonMain/src/kotlinx/serialization/Tagged.kt
index 63f9a2e5..63f9a2e5 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/Tagged.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/Tagged.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/cbor/Cbor.kt b/runtime/commonMain/src/kotlinx/serialization/cbor/Cbor.kt
index 243e412b..243e412b 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/cbor/Cbor.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/cbor/Cbor.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/cbor/Deprecated.kt b/runtime/commonMain/src/kotlinx/serialization/cbor/Deprecated.kt
index 36b671da..36b671da 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/cbor/Deprecated.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/cbor/Deprecated.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/CollectionDescriptors.kt b/runtime/commonMain/src/kotlinx/serialization/internal/CollectionDescriptors.kt
index 305b6689..305b6689 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/CollectionDescriptors.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/internal/CollectionDescriptors.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/CollectionSerializers.kt b/runtime/commonMain/src/kotlinx/serialization/internal/CollectionSerializers.kt
index e921abe0..e921abe0 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/CollectionSerializers.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/internal/CollectionSerializers.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/Enums.kt b/runtime/commonMain/src/kotlinx/serialization/internal/Enums.kt
index 87fdc9e3..87fdc9e3 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/Enums.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/internal/Enums.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/GeneratedSerializer.kt b/runtime/commonMain/src/kotlinx/serialization/internal/GeneratedSerializer.kt
index 7afba4bb..7afba4bb 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/GeneratedSerializer.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/internal/GeneratedSerializer.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/LongAsStringSerializer.kt b/runtime/commonMain/src/kotlinx/serialization/internal/LongAsStringSerializer.kt
index 07c0b347..07c0b347 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/LongAsStringSerializer.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/internal/LongAsStringSerializer.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/NullableSerializer.kt b/runtime/commonMain/src/kotlinx/serialization/internal/NullableSerializer.kt
index 23309beb..23309beb 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/NullableSerializer.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/internal/NullableSerializer.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/Primitives.kt b/runtime/commonMain/src/kotlinx/serialization/internal/Primitives.kt
index 34017a8d..34017a8d 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/Primitives.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/internal/Primitives.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/SerialClassDescImpl.kt b/runtime/commonMain/src/kotlinx/serialization/internal/SerialClassDescImpl.kt
index 5bc5b2e3..5bc5b2e3 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/SerialClassDescImpl.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/internal/SerialClassDescImpl.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/Tuples.kt b/runtime/commonMain/src/kotlinx/serialization/internal/Tuples.kt
index 4222128c..4222128c 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/Tuples.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/internal/Tuples.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/Util.kt b/runtime/commonMain/src/kotlinx/serialization/internal/Util.kt
index d60b76ca..d60b76ca 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/Util.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/internal/Util.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/Deprecated.kt b/runtime/commonMain/src/kotlinx/serialization/json/Deprecated.kt
index b1e6eed0..b1e6eed0 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/Deprecated.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/Deprecated.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/Json.kt b/runtime/commonMain/src/kotlinx/serialization/json/Json.kt
index efc8e645..efc8e645 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/Json.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/Json.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonConfiguration.kt b/runtime/commonMain/src/kotlinx/serialization/json/JsonConfiguration.kt
index 5d06b600..5d06b600 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonConfiguration.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/JsonConfiguration.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonElement.kt b/runtime/commonMain/src/kotlinx/serialization/json/JsonElement.kt
index 1d1c0c1c..1d1c0c1c 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonElement.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/JsonElement.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonElementBuilders.kt b/runtime/commonMain/src/kotlinx/serialization/json/JsonElementBuilders.kt
index 2f1f2598..2f1f2598 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonElementBuilders.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/JsonElementBuilders.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonElementSerializer.kt b/runtime/commonMain/src/kotlinx/serialization/json/JsonElementSerializer.kt
index 733f6b6f..733f6b6f 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonElementSerializer.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/JsonElementSerializer.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonElements.kt b/runtime/commonMain/src/kotlinx/serialization/json/JsonElements.kt
index 86be450f..86be450f 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonElements.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/JsonElements.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonExceptions.kt b/runtime/commonMain/src/kotlinx/serialization/json/JsonExceptions.kt
index 5dec81ef..5dec81ef 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonExceptions.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/JsonExceptions.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonInput.kt b/runtime/commonMain/src/kotlinx/serialization/json/JsonInput.kt
index b9c25eec..b9c25eec 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonInput.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/JsonInput.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonOutput.kt b/runtime/commonMain/src/kotlinx/serialization/json/JsonOutput.kt
index 25f69262..25f69262 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/JsonOutput.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/JsonOutput.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/JsonParser.kt b/runtime/commonMain/src/kotlinx/serialization/json/internal/JsonParser.kt
index 34fc4c79..34fc4c79 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/JsonParser.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/internal/JsonParser.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/JsonReader.kt b/runtime/commonMain/src/kotlinx/serialization/json/internal/JsonReader.kt
index 7ba12d5c..7ba12d5c 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/JsonReader.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/internal/JsonReader.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/Polymorphic.kt b/runtime/commonMain/src/kotlinx/serialization/json/internal/Polymorphic.kt
index 12a1bdb5..12a1bdb5 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/Polymorphic.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/internal/Polymorphic.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/StreamingJsonInput.kt b/runtime/commonMain/src/kotlinx/serialization/json/internal/StreamingJsonInput.kt
index f4a9ae3d..f4a9ae3d 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/StreamingJsonInput.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/internal/StreamingJsonInput.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/StreamingJsonOutput.kt b/runtime/commonMain/src/kotlinx/serialization/json/internal/StreamingJsonOutput.kt
index b0c6e85f..b0c6e85f 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/StreamingJsonOutput.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/internal/StreamingJsonOutput.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/StringOps.kt b/runtime/commonMain/src/kotlinx/serialization/json/internal/StringOps.kt
index 40e4cef8..40e4cef8 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/StringOps.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/internal/StringOps.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/TreeJsonInput.kt b/runtime/commonMain/src/kotlinx/serialization/json/internal/TreeJsonInput.kt
index 55785b5c..55785b5c 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/TreeJsonInput.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/internal/TreeJsonInput.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/TreeJsonOutput.kt b/runtime/commonMain/src/kotlinx/serialization/json/internal/TreeJsonOutput.kt
index 1d11f1f9..1d11f1f9 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/TreeJsonOutput.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/internal/TreeJsonOutput.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/WriteMode.kt b/runtime/commonMain/src/kotlinx/serialization/json/internal/WriteMode.kt
index e87a08da..e87a08da 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/json/internal/WriteMode.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/json/internal/WriteMode.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/PolymorphicModuleBuilder.kt b/runtime/commonMain/src/kotlinx/serialization/modules/PolymorphicModuleBuilder.kt
index e178b62a..e178b62a 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/PolymorphicModuleBuilder.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/modules/PolymorphicModuleBuilder.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/SerialModule.kt b/runtime/commonMain/src/kotlinx/serialization/modules/SerialModule.kt
index d96e4eaa..d96e4eaa 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/SerialModule.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/modules/SerialModule.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/SerialModuleBuilders.kt b/runtime/commonMain/src/kotlinx/serialization/modules/SerialModuleBuilders.kt
index 20f28072..20f28072 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/SerialModuleBuilders.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/modules/SerialModuleBuilders.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/SerialModuleCollector.kt b/runtime/commonMain/src/kotlinx/serialization/modules/SerialModuleCollector.kt
index 74a1f25b..74a1f25b 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/SerialModuleCollector.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/modules/SerialModuleCollector.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/SerialModuleExtensions.kt b/runtime/commonMain/src/kotlinx/serialization/modules/SerialModuleExtensions.kt
index de102588..de102588 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/SerialModuleExtensions.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/modules/SerialModuleExtensions.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/SerialModuleImpl.kt b/runtime/commonMain/src/kotlinx/serialization/modules/SerialModuleImpl.kt
index 151f0031..151f0031 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/SerialModuleImpl.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/modules/SerialModuleImpl.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/SerializerAlreadyRegisteredException.kt b/runtime/commonMain/src/kotlinx/serialization/modules/SerializerAlreadyRegisteredException.kt
index f86517c7..f86517c7 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/SerializerAlreadyRegisteredException.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/modules/SerializerAlreadyRegisteredException.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/StandardSubtypesOfAny.kt b/runtime/commonMain/src/kotlinx/serialization/modules/StandardSubtypesOfAny.kt
index d9b69b9f..d9b69b9f 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/modules/StandardSubtypesOfAny.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/modules/StandardSubtypesOfAny.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/protobuf/ProtoBuf.kt b/runtime/commonMain/src/kotlinx/serialization/protobuf/ProtoBuf.kt
index 5a4e0a03..5a4e0a03 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/protobuf/ProtoBuf.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/protobuf/ProtoBuf.kt
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/protobuf/ProtoTypes.kt b/runtime/commonMain/src/kotlinx/serialization/protobuf/ProtoTypes.kt
index c62ce899..c62ce899 100644
--- a/runtime/common/src/main/kotlin/kotlinx/serialization/protobuf/ProtoTypes.kt
+++ b/runtime/commonMain/src/kotlinx/serialization/protobuf/ProtoTypes.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/io/ByteBufferTest.kt b/runtime/commonTest/src/kotlinx/io/ByteBufferTest.kt
index 039ec1fa..039ec1fa 100644
--- a/runtime/common/src/testWithNative/kotlinx/io/ByteBufferTest.kt
+++ b/runtime/commonTest/src/kotlinx/io/ByteBufferTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/BigClassesTest.kt b/runtime/commonTest/src/kotlinx/serialization/BigClassesTest.kt
index 12783f3b..12783f3b 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/BigClassesTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/BigClassesTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/SampleClasses.kt b/runtime/commonTest/src/kotlinx/serialization/SampleClasses.kt
index 31178553..31178553 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/SampleClasses.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/SampleClasses.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/SerialNamesTest.kt b/runtime/commonTest/src/kotlinx/serialization/SerialNamesTest.kt
index 43d0c2ff..43d0c2ff 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/SerialNamesTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/SerialNamesTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/SerializeZooTest.kt b/runtime/commonTest/src/kotlinx/serialization/SerializeZooTest.kt
index f0a249d0..f0a249d0 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/SerializeZooTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/SerializeZooTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/UnknownElementIndexTest.kt b/runtime/commonTest/src/kotlinx/serialization/UnknownElementIndexTest.kt
index 4d789f8e..4d789f8e 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/UnknownElementIndexTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/UnknownElementIndexTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/cbor/CborReaderTest.kt b/runtime/commonTest/src/kotlinx/serialization/cbor/CborReaderTest.kt
index e6776bf7..e6776bf7 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/cbor/CborReaderTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/cbor/CborReaderTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/cbor/CborRootLevelNullsTest.kt b/runtime/commonTest/src/kotlinx/serialization/cbor/CborRootLevelNullsTest.kt
index c9029ac1..c9029ac1 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/cbor/CborRootLevelNullsTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/cbor/CborRootLevelNullsTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/cbor/CborWriterTest.kt b/runtime/commonTest/src/kotlinx/serialization/cbor/CborWriterTest.kt
index 397ea00c..397ea00c 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/cbor/CborWriterTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/cbor/CborWriterTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/cbor/SampleClasses.kt b/runtime/commonTest/src/kotlinx/serialization/cbor/SampleClasses.kt
index 8f0435b1..8f0435b1 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/cbor/SampleClasses.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/cbor/SampleClasses.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/BinaryPayloadExampleTest.kt b/runtime/commonTest/src/kotlinx/serialization/features/BinaryPayloadExampleTest.kt
index b8fd8cdb..b8fd8cdb 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/BinaryPayloadExampleTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/BinaryPayloadExampleTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/ContextAndPolymorphicTest.kt b/runtime/commonTest/src/kotlinx/serialization/features/ContextAndPolymorphicTest.kt
index 53259bbc..53259bbc 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/ContextAndPolymorphicTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/ContextAndPolymorphicTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/GenericCustomSerializerTest.kt b/runtime/commonTest/src/kotlinx/serialization/features/GenericCustomSerializerTest.kt
index a3f44574..a3f44574 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/GenericCustomSerializerTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/GenericCustomSerializerTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/InheritanceTest.kt b/runtime/commonTest/src/kotlinx/serialization/features/InheritanceTest.kt
index 863f3adc..863f3adc 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/InheritanceTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/InheritanceTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/LongAsStringTest.kt b/runtime/commonTest/src/kotlinx/serialization/features/LongAsStringTest.kt
index 8d6fcd4b..8d6fcd4b 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/LongAsStringTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/LongAsStringTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/PartiallyCustomSerializerTest.kt b/runtime/commonTest/src/kotlinx/serialization/features/PartiallyCustomSerializerTest.kt
index 8fa9bf94..8fa9bf94 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/PartiallyCustomSerializerTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/PartiallyCustomSerializerTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/PolymorphicOnClassesTest.kt b/runtime/commonTest/src/kotlinx/serialization/features/PolymorphicOnClassesTest.kt
index 5d6a2203..5d6a2203 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/PolymorphicOnClassesTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/PolymorphicOnClassesTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/PolymorphismTest.kt b/runtime/commonTest/src/kotlinx/serialization/features/PolymorphismTest.kt
index 9983f626..9983f626 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/PolymorphismTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/PolymorphismTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/PolymorphismTestData.kt b/runtime/commonTest/src/kotlinx/serialization/features/PolymorphismTestData.kt
index 08f4ebf3..08f4ebf3 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/PolymorphismTestData.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/PolymorphismTestData.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/PolymorphismWithAnyTest.kt b/runtime/commonTest/src/kotlinx/serialization/features/PolymorphismWithAnyTest.kt
index f295f528..f295f528 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/PolymorphismWithAnyTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/PolymorphismWithAnyTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/SchemaTest.kt b/runtime/commonTest/src/kotlinx/serialization/features/SchemaTest.kt
index b52fbbe1..b52fbbe1 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/SchemaTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/SchemaTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/SealedPolymorphismTest.kt b/runtime/commonTest/src/kotlinx/serialization/features/SealedPolymorphismTest.kt
index 423cfa4f..423cfa4f 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/SealedPolymorphismTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/SealedPolymorphismTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/SerializableOnTypeUsageTest.kt b/runtime/commonTest/src/kotlinx/serialization/features/SerializableOnTypeUsageTest.kt
index 4d7b4a07..4d7b4a07 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/SerializableOnTypeUsageTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/SerializableOnTypeUsageTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/SerializableWithTest.kt b/runtime/commonTest/src/kotlinx/serialization/features/SerializableWithTest.kt
index ee373e7a..ee373e7a 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/SerializableWithTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/SerializableWithTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/SkipDefaults.kt b/runtime/commonTest/src/kotlinx/serialization/features/SkipDefaults.kt
index 85625024..85625024 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/SkipDefaults.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/SkipDefaults.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/features/UseSerializersTest.kt b/runtime/commonTest/src/kotlinx/serialization/features/UseSerializersTest.kt
index dd36973c..dd36973c 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/features/UseSerializersTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/features/UseSerializersTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonGenericTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/JsonGenericTest.kt
index 1891f746..1891f746 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonGenericTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/JsonGenericTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonInputOutputRecursiveTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/JsonInputOutputRecursiveTest.kt
index 35a95322..35a95322 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonInputOutputRecursiveTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/JsonInputOutputRecursiveTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonMapKeys.kt b/runtime/commonTest/src/kotlinx/serialization/json/JsonMapKeys.kt
index d8337096..d8337096 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonMapKeys.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/JsonMapKeys.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonModesTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/JsonModesTest.kt
index 821e3d93..821e3d93 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonModesTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/JsonModesTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonOptionalTests.kt b/runtime/commonTest/src/kotlinx/serialization/json/JsonOptionalTests.kt
index 3e00b78b..3e00b78b 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonOptionalTests.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/JsonOptionalTests.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonParserFuzzerTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/JsonParserFuzzerTest.kt
index d360f647..d360f647 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonParserFuzzerTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/JsonParserFuzzerTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonRootLevelNullTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/JsonRootLevelNullTest.kt
index 09f88395..09f88395 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonRootLevelNullTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/JsonRootLevelNullTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonSealedSubclassTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/JsonSealedSubclassTest.kt
index e2d82977..e2d82977 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonSealedSubclassTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/JsonSealedSubclassTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonTestBase.kt b/runtime/commonTest/src/kotlinx/serialization/json/JsonTestBase.kt
index 5cec49b4..5cec49b4 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonTestBase.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/JsonTestBase.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonTransientTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/JsonTransientTest.kt
index 8da3e3a9..8da3e3a9 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonTransientTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/JsonTransientTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonTreeAndMapperTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/JsonTreeAndMapperTest.kt
index 4373a67d..4373a67d 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonTreeAndMapperTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/JsonTreeAndMapperTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonTreeTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/JsonTreeTest.kt
index b0e7c341..b0e7c341 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonTreeTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/JsonTreeTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonUnionEnumTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/JsonUnionEnumTest.kt
index 9325b423..9325b423 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonUnionEnumTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/JsonUnionEnumTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonUpdateModeTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/JsonUpdateModeTest.kt
index 01e64abf..01e64abf 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/JsonUpdateModeTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/JsonUpdateModeTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/parser/examples/Parsers.kt b/runtime/commonTest/src/kotlinx/serialization/json/parser/examples/Parsers.kt
index 6c8e1662..6c8e1662 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/parser/examples/Parsers.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/parser/examples/Parsers.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/parser/examples/User.kt b/runtime/commonTest/src/kotlinx/serialization/json/parser/examples/User.kt
index e6c2ae74..e6c2ae74 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/parser/examples/User.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/parser/examples/User.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/parser/examples/UserTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/parser/examples/UserTest.kt
index e7829466..e7829466 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/parser/examples/UserTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/parser/examples/UserTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/polymorphic/JsonListPolymorphismTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/polymorphic/JsonListPolymorphismTest.kt
index 5e25f546..5e25f546 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/polymorphic/JsonListPolymorphismTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/polymorphic/JsonListPolymorphismTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/polymorphic/JsonMapPolymorphismTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/polymorphic/JsonMapPolymorphismTest.kt
index 113da701..113da701 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/polymorphic/JsonMapPolymorphismTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/polymorphic/JsonMapPolymorphismTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/polymorphic/JsonNestedPolymorphismTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/polymorphic/JsonNestedPolymorphismTest.kt
index 849181db..849181db 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/polymorphic/JsonNestedPolymorphismTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/polymorphic/JsonNestedPolymorphismTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/polymorphic/JsonPolymorphicClassDescriptor.kt b/runtime/commonTest/src/kotlinx/serialization/json/polymorphic/JsonPolymorphicClassDescriptor.kt
index 843725d4..843725d4 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/polymorphic/JsonPolymorphicClassDescriptor.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/polymorphic/JsonPolymorphicClassDescriptor.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/polymorphic/JsonPropertyPolymorphicTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/polymorphic/JsonPropertyPolymorphicTest.kt
index 7fa3c833..7fa3c833 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/polymorphic/JsonPropertyPolymorphicTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/polymorphic/JsonPropertyPolymorphicTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/polymorphic/PolymorphicClasses.kt b/runtime/commonTest/src/kotlinx/serialization/json/polymorphic/PolymorphicClasses.kt
index b53a5035..b53a5035 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/polymorphic/PolymorphicClasses.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/polymorphic/PolymorphicClasses.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/serializers/JsonArraySerializerTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/serializers/JsonArraySerializerTest.kt
index 5b92ccaf..5b92ccaf 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/serializers/JsonArraySerializerTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/serializers/JsonArraySerializerTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/serializers/JsonNullSerializerTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/serializers/JsonNullSerializerTest.kt
index f398a237..f398a237 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/serializers/JsonNullSerializerTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/serializers/JsonNullSerializerTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/serializers/JsonObjectSerializerTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/serializers/JsonObjectSerializerTest.kt
index e053b18b..e053b18b 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/serializers/JsonObjectSerializerTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/serializers/JsonObjectSerializerTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/serializers/JsonPrimitiveSerializerTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/serializers/JsonPrimitiveSerializerTest.kt
index 5f46c035..5f46c035 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/serializers/JsonPrimitiveSerializerTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/serializers/JsonPrimitiveSerializerTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/serializers/JsonSerializerInGenericsTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/serializers/JsonSerializerInGenericsTest.kt
index 24895a2d..24895a2d 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/serializers/JsonSerializerInGenericsTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/serializers/JsonSerializerInGenericsTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/serializers/JsonTreeTest.kt b/runtime/commonTest/src/kotlinx/serialization/json/serializers/JsonTreeTest.kt
index 3e0fb8bf..3e0fb8bf 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/serializers/JsonTreeTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/serializers/JsonTreeTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/json/serializers/Primitives.kt b/runtime/commonTest/src/kotlinx/serialization/json/serializers/Primitives.kt
index d9666541..d9666541 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/json/serializers/Primitives.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/json/serializers/Primitives.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/modules/ModuleBuildersTest.kt b/runtime/commonTest/src/kotlinx/serialization/modules/ModuleBuildersTest.kt
index cf74cfcc..cf74cfcc 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/modules/ModuleBuildersTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/modules/ModuleBuildersTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/protobuf/AutoAssignIdsTest.kt b/runtime/commonTest/src/kotlinx/serialization/protobuf/AutoAssignIdsTest.kt
index f96cb5af..f96cb5af 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/protobuf/AutoAssignIdsTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/protobuf/AutoAssignIdsTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/protobuf/ProtobufReaderTest.kt b/runtime/commonTest/src/kotlinx/serialization/protobuf/ProtobufReaderTest.kt
index 1492e932..1492e932 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/protobuf/ProtobufReaderTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/protobuf/ProtobufReaderTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/protobuf/ProtobufUnionEnumTest.kt b/runtime/commonTest/src/kotlinx/serialization/protobuf/ProtobufUnionEnumTest.kt
index f31f4eaf..f31f4eaf 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/protobuf/ProtobufUnionEnumTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/protobuf/ProtobufUnionEnumTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/protobuf/ProtobufWriterTest.kt b/runtime/commonTest/src/kotlinx/serialization/protobuf/ProtobufWriterTest.kt
index 45a16742..45a16742 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/protobuf/ProtobufWriterTest.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/protobuf/ProtobufWriterTest.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/protobuf/SampleClasses.kt b/runtime/commonTest/src/kotlinx/serialization/protobuf/SampleClasses.kt
index 1a8d83a2..1a8d83a2 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/protobuf/SampleClasses.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/protobuf/SampleClasses.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/test/CurrentPlatform.common.kt b/runtime/commonTest/src/kotlinx/serialization/test/CurrentPlatform.common.kt
index 2a9f9f0b..2a9f9f0b 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/test/CurrentPlatform.common.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/test/CurrentPlatform.common.kt
diff --git a/runtime/common/src/testWithNative/kotlinx/serialization/test/TestingFramework.kt b/runtime/commonTest/src/kotlinx/serialization/test/TestingFramework.kt
index afba6606..afba6606 100644
--- a/runtime/common/src/testWithNative/kotlinx/serialization/test/TestingFramework.kt
+++ b/runtime/commonTest/src/kotlinx/serialization/test/TestingFramework.kt
diff --git a/runtime/js/build.gradle b/runtime/js/build.gradle
deleted file mode 100644
index ba2cfdc0..00000000
--- a/runtime/js/build.gradle
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2018 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-plugins {
-    id "com.moowork.node" version "1.2.0"
-}
-
-ext {
-    nodeVersion = '8.11.1'
-    qunitjsVersion = '2.4.0'
-}
-
-apply plugin: 'kotlin-platform-js'
-
-dependencies {
-    expectedBy project(':common')
-
-    compile libraries.kotlin_stdlib_js
-    testCompile libraries.kotlin_test_js
-}
-
-compileKotlin2Js {
-    kotlinOptions.moduleKind = "umd"
-    kotlinOptions.sourceMap = true
-    kotlinOptions.metaInfo = true
-}
-
-compileTestKotlin2Js {
-    kotlinOptions.moduleKind = "commonjs"
-    kotlinOptions.sourceMap = true
-}
-
-node {
-    version = nodeVersion
-    download = true
-    nodeModulesDir = file(buildDir)
-}
-
-task populateNodeModules(type: Copy, dependsOn: [compileKotlin2Js]) {
-    from compileKotlin2Js.destinationDir
-    into "$node.nodeModulesDir/node_modules"
-
-    afterEvaluate {
-        configurations.testCompile.each {
-            if (it.absolutePath.endsWith(".jar")) {
-                from zipTree(it.absolutePath).matching {
-                    include '*.js'
-                    include '*.js.map'
-                }
-            }
-        }
-    }
-}
-
-// Workaround the problem with Node downloading:
-// Konan plugin uses Gradle-metadata feature which is not compatible
-// with node plugin download implementation
-repositories.whenObjectAdded {
-    if (it instanceof IvyArtifactRepository) {
-        metadataSources {
-            artifact()
-        }
-    }
-}
-
-task installQunit(type: NpmTask) {
-    inputs.property('qunitjsVersion', qunitjsVersion)
-    outputs.dir file("$node.nodeModulesDir/node_modules/qunitjs")
-
-    args = ['install', "qunitjs@${qunitjsVersion}"]
-}
-
-task runQunit(type: NodeTask, dependsOn: [compileTestKotlin2Js, populateNodeModules, installQunit]) {
-    script = file("$node.nodeModulesDir/node_modules/qunitjs/bin/qunit")
-    args = [projectDir.toPath().relativize(file(compileTestKotlin2Js.outputFile).toPath())]
-    if (project.hasProperty("tests")) args += ["-f", project.property('tests')]
-}
-
-test.dependsOn runQunit
diff --git a/runtime/js/src/main/kotlin/kotlinx/io/Buffers.kt b/runtime/jsMain/src/kotlinx/io/Buffers.kt
index e0e59842..e0e59842 100644
--- a/runtime/js/src/main/kotlin/kotlinx/io/Buffers.kt
+++ b/runtime/jsMain/src/kotlinx/io/Buffers.kt
diff --git a/runtime/js/src/main/kotlin/kotlinx/io/Streams.kt b/runtime/jsMain/src/kotlinx/io/Streams.kt
index d61a308b..d61a308b 100644
--- a/runtime/js/src/main/kotlin/kotlinx/io/Streams.kt
+++ b/runtime/jsMain/src/kotlinx/io/Streams.kt
diff --git a/runtime/js/src/main/kotlin/kotlinx/io/Writers.kt b/runtime/jsMain/src/kotlinx/io/Writers.kt
index 31f3970d..31f3970d 100755
--- a/runtime/js/src/main/kotlin/kotlinx/io/Writers.kt
+++ b/runtime/jsMain/src/kotlinx/io/Writers.kt
diff --git a/runtime/js/src/main/kotlin/kotlinx/serialization/DynamicObjectParser.kt b/runtime/jsMain/src/kotlinx/serialization/DynamicObjectParser.kt
index d3b1c72a..d3b1c72a 100644
--- a/runtime/js/src/main/kotlin/kotlinx/serialization/DynamicObjectParser.kt
+++ b/runtime/jsMain/src/kotlinx/serialization/DynamicObjectParser.kt
diff --git a/runtime/js/src/main/kotlin/kotlinx/serialization/Serialization.kt b/runtime/jsMain/src/kotlinx/serialization/Serialization.kt
index 74876a44..74876a44 100644
--- a/runtime/js/src/main/kotlin/kotlinx/serialization/Serialization.kt
+++ b/runtime/jsMain/src/kotlinx/serialization/Serialization.kt
diff --git a/runtime/js/src/test/kotlin/kotlinx/serialization/DynamicParserTest.kt b/runtime/jsTest/src/kotlinx/serialization/DynamicParserTest.kt
index 593b8c0f..593b8c0f 100644
--- a/runtime/js/src/test/kotlin/kotlinx/serialization/DynamicParserTest.kt
+++ b/runtime/jsTest/src/kotlinx/serialization/DynamicParserTest.kt
diff --git a/runtime/js/src/test/kotlin/kotlinx/serialization/DynamicToLongTest.kt b/runtime/jsTest/src/kotlinx/serialization/DynamicToLongTest.kt
index 6bf19c1b..6bf19c1b 100644
--- a/runtime/js/src/test/kotlin/kotlinx/serialization/DynamicToLongTest.kt
+++ b/runtime/jsTest/src/kotlinx/serialization/DynamicToLongTest.kt
diff --git a/runtime/js/src/test/kotlin/kotlinx/serialization/JsTest.kt b/runtime/jsTest/src/kotlinx/serialization/JsTest.kt
index b541b8d2..b541b8d2 100644
--- a/runtime/js/src/test/kotlin/kotlinx/serialization/JsTest.kt
+++ b/runtime/jsTest/src/kotlinx/serialization/JsTest.kt
diff --git a/runtime/js/src/test/kotlin/kotlinx/serialization/StringTest.kt b/runtime/jsTest/src/kotlinx/serialization/StringTest.kt
index a08814b3..a08814b3 100644
--- a/runtime/js/src/test/kotlin/kotlinx/serialization/StringTest.kt
+++ b/runtime/jsTest/src/kotlinx/serialization/StringTest.kt
diff --git a/runtime/js/src/test/kotlin/kotlinx/serialization/test/CurrentPlatform.kt b/runtime/jsTest/src/kotlinx/serialization/test/CurrentPlatform.kt
index ef29ce1a..ef29ce1a 100644
--- a/runtime/js/src/test/kotlin/kotlinx/serialization/test/CurrentPlatform.kt
+++ b/runtime/jsTest/src/kotlinx/serialization/test/CurrentPlatform.kt
diff --git a/runtime/jvm/build.gradle b/runtime/jvm/build.gradle
deleted file mode 100644
index da7238e5..00000000
--- a/runtime/jvm/build.gradle
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-apply plugin: 'java'
-apply plugin: 'kotlin-platform-jvm'
-
-sourceSets {
-    main.java.srcDirs += 'src/main/kotlin'
-}
-
-ext {
-    jacksonVersion = '2.9.1'
-}
-
-apply plugin: 'com.google.protobuf'
-
-protobuf {
-    protoc {
-        // Download from repositories
-        artifact = 'com.google.protobuf:protoc:3.0.0'
-    }
-}
-
-compileTestKotlin {
-    dependsOn 'generateTestProto'
-}
-
-clean {
-    delete protobuf.generatedFilesBaseDir
-}
-
-sourceSets {
-    test {
-        java {
-            srcDirs += file("${protobuf.generatedFilesBaseDir}/test/java")
-        }
-    }
-}
-
-
-dependencies {
-    expectedBy project(':common')
-
-    compile libraries.kotlin_stdlib
-
-    testCompile libraries.kotlin_test
-    testCompile libraries.kotlin_reflect
-    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$librariesVersion"
-    testCompile group: 'junit', name: 'junit', version: '4.4'
-    testCompile 'io.kotlintest:kotlintest:2.0.4'
-
-    testCompile 'com.google.protobuf:protobuf-java:3.0.0'
-    testCompile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: jacksonVersion
-    testCompile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
-    testCompile group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: jacksonVersion
-    testCompile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: jacksonVersion
-    testCompile group: 'com.google.code.gson', name: 'gson', version: '2.7'
-}
-compileJava {
-    sourceCompatibility = "1.6"
-    targetCompatibility = "1.6"
-}
-
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.6"
-}
diff --git a/runtime/common/src/test/kotlin/kotlinx/serialization/MapperTest.kt b/runtime/jvmJsTest/src/kotlinx/serialization/MapperTest.kt
index f04f6794..f04f6794 100644
--- a/runtime/common/src/test/kotlin/kotlinx/serialization/MapperTest.kt
+++ b/runtime/jvmJsTest/src/kotlinx/serialization/MapperTest.kt
diff --git a/runtime/common/src/test/kotlin/kotlinx/serialization/TaggedTest.kt b/runtime/jvmJsTest/src/kotlinx/serialization/TaggedTest.kt
index 077b159d..077b159d 100644
--- a/runtime/common/src/test/kotlin/kotlinx/serialization/TaggedTest.kt
+++ b/runtime/jvmJsTest/src/kotlinx/serialization/TaggedTest.kt
diff --git a/runtime/common/src/test/kotlin/kotlinx/serialization/json/JsonCustomSerializersTest.kt b/runtime/jvmJsTest/src/kotlinx/serialization/json/JsonCustomSerializersTest.kt
index a75f536e..a75f536e 100644
--- a/runtime/common/src/test/kotlin/kotlinx/serialization/json/JsonCustomSerializersTest.kt
+++ b/runtime/jvmJsTest/src/kotlinx/serialization/json/JsonCustomSerializersTest.kt
diff --git a/runtime/common/src/test/kotlin/kotlinx/serialization/json/JsonReifiedCollectionsTest.kt b/runtime/jvmJsTest/src/kotlinx/serialization/json/JsonReifiedCollectionsTest.kt
index 68f33ff5..68f33ff5 100644
--- a/runtime/common/src/test/kotlin/kotlinx/serialization/json/JsonReifiedCollectionsTest.kt
+++ b/runtime/jvmJsTest/src/kotlinx/serialization/json/JsonReifiedCollectionsTest.kt
diff --git a/runtime/common/src/test/kotlin/kotlinx/serialization/protobuf/CustomSerializersProtobufTest.kt b/runtime/jvmJsTest/src/kotlinx/serialization/protobuf/CustomSerializersProtobufTest.kt
index 87671eaf..87671eaf 100644
--- a/runtime/common/src/test/kotlin/kotlinx/serialization/protobuf/CustomSerializersProtobufTest.kt
+++ b/runtime/jvmJsTest/src/kotlinx/serialization/protobuf/CustomSerializersProtobufTest.kt
diff --git a/runtime/jvm/src/main/kotlin/kotlinx/io/Buffers.kt b/runtime/jvmMain/src/kotlinx/io/Buffers.kt
index 37a53335..37a53335 100644
--- a/runtime/jvm/src/main/kotlin/kotlinx/io/Buffers.kt
+++ b/runtime/jvmMain/src/kotlinx/io/Buffers.kt
diff --git a/runtime/jvm/src/main/kotlin/kotlinx/io/Streams.kt b/runtime/jvmMain/src/kotlinx/io/Streams.kt
index 7789c0d1..7789c0d1 100644
--- a/runtime/jvm/src/main/kotlin/kotlinx/io/Streams.kt
+++ b/runtime/jvmMain/src/kotlinx/io/Streams.kt
diff --git a/runtime/jvm/src/main/kotlin/kotlinx/io/Writers.kt b/runtime/jvmMain/src/kotlinx/io/Writers.kt
index b517774f..b517774f 100644
--- a/runtime/jvm/src/main/kotlin/kotlinx/io/Writers.kt
+++ b/runtime/jvmMain/src/kotlinx/io/Writers.kt
diff --git a/runtime/jvm/src/main/kotlin/kotlinx/serialization/JvmResolving.kt b/runtime/jvmMain/src/kotlinx/serialization/JvmResolving.kt
index bf7f20b0..bf7f20b0 100644
--- a/runtime/jvm/src/main/kotlin/kotlinx/serialization/JvmResolving.kt
+++ b/runtime/jvmMain/src/kotlinx/serialization/JvmResolving.kt
diff --git a/runtime/jvm/src/main/kotlin/kotlinx/serialization/Serialization.kt b/runtime/jvmMain/src/kotlinx/serialization/Serialization.kt
index 0c30ad87..0c30ad87 100644
--- a/runtime/jvm/src/main/kotlin/kotlinx/serialization/Serialization.kt
+++ b/runtime/jvmMain/src/kotlinx/serialization/Serialization.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/JavaCollectionsTest.kt b/runtime/jvmTest/src/kotlinx/serialization/JavaCollectionsTest.kt
index e3ef6226..e3ef6226 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/JavaCollectionsTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/JavaCollectionsTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/SerializationCasesTest.kt b/runtime/jvmTest/src/kotlinx/serialization/SerializationCasesTest.kt
index 422dea76..422dea76 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/SerializationCasesTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/SerializationCasesTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/SerializationMethodInvocationOrderTest.kt b/runtime/jvmTest/src/kotlinx/serialization/SerializationMethodInvocationOrderTest.kt
index 4734a79f..4734a79f 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/SerializationMethodInvocationOrderTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/SerializationMethodInvocationOrderTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/SerializeFlatTest.kt b/runtime/jvmTest/src/kotlinx/serialization/SerializeFlatTest.kt
index 7a51bb2b..7a51bb2b 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/SerializeFlatTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/SerializeFlatTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/features/ContextualSerializationOnFileTest.kt b/runtime/jvmTest/src/kotlinx/serialization/features/ContextualSerializationOnFileTest.kt
index 51059fe4..51059fe4 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/features/ContextualSerializationOnFileTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/features/ContextualSerializationOnFileTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/features/GenericTest.kt b/runtime/jvmTest/src/kotlinx/serialization/features/GenericTest.kt
index b87c8376..b87c8376 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/features/GenericTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/features/GenericTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/features/InternalInheritanceTest.kt b/runtime/jvmTest/src/kotlinx/serialization/features/InternalInheritanceTest.kt
index 482581fb..482581fb 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/features/InternalInheritanceTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/features/InternalInheritanceTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/features/JsonUpdateCustomTest.kt b/runtime/jvmTest/src/kotlinx/serialization/features/JsonUpdateCustomTest.kt
index 2029b200..2029b200 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/features/JsonUpdateCustomTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/features/JsonUpdateCustomTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/features/PolymorphicWithJvmClassTest.kt b/runtime/jvmTest/src/kotlinx/serialization/features/PolymorphicWithJvmClassTest.kt
index f21ea240..f21ea240 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/features/PolymorphicWithJvmClassTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/features/PolymorphicWithJvmClassTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/features/ResolvingTest.kt b/runtime/jvmTest/src/kotlinx/serialization/features/ResolvingTest.kt
index b369a0de..b369a0de 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/features/ResolvingTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/features/ResolvingTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/features/SerializeJavaClassTest.kt b/runtime/jvmTest/src/kotlinx/serialization/features/SerializeJavaClassTest.kt
index 33f2af0b..33f2af0b 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/features/SerializeJavaClassTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/features/SerializeJavaClassTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/formats/RandomTests.kt b/runtime/jvmTest/src/kotlinx/serialization/formats/RandomTests.kt
index 3bc58c54..3bc58c54 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/formats/RandomTests.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/formats/RandomTests.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/formats/cbor/CborWriterTest.kt b/runtime/jvmTest/src/kotlinx/serialization/formats/cbor/CborWriterTest.kt
index 96a21846..96a21846 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/formats/cbor/CborWriterTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/formats/cbor/CborWriterTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/formats/json/GsonCompatibilityTest.kt b/runtime/jvmTest/src/kotlinx/serialization/formats/json/GsonCompatibilityTest.kt
index 7e59c797..7e59c797 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/formats/json/GsonCompatibilityTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/formats/json/GsonCompatibilityTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/formats/protobuf/ProtoCompatibilityTest.kt b/runtime/jvmTest/src/kotlinx/serialization/formats/protobuf/ProtoCompatibilityTest.kt
index 37101d18..37101d18 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/formats/protobuf/ProtoCompatibilityTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/formats/protobuf/ProtoCompatibilityTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/privateclasstest/PrivateDataOutOfKotlinXSerializationPackageTest.kt b/runtime/jvmTest/src/kotlinx/serialization/privateclasstest/PrivateDataOutOfKotlinXSerializationPackageTest.kt
index 6195b3e9..6195b3e9 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/privateclasstest/PrivateDataOutOfKotlinXSerializationPackageTest.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/privateclasstest/PrivateDataOutOfKotlinXSerializationPackageTest.kt
diff --git a/runtime/jvm/src/test/kotlin/kotlinx/serialization/test/CurrentPlatform.kt b/runtime/jvmTest/src/kotlinx/serialization/test/CurrentPlatform.kt
index 3e16ed02..3e16ed02 100644
--- a/runtime/jvm/src/test/kotlin/kotlinx/serialization/test/CurrentPlatform.kt
+++ b/runtime/jvmTest/src/kotlinx/serialization/test/CurrentPlatform.kt
diff --git a/runtime/native/build.gradle b/runtime/native/build.gradle
deleted file mode 100644
index 9bb65436..00000000
--- a/runtime/native/build.gradle
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2017-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
- */
-
-
-apply plugin: 'kotlin-platform-native'
-apply plugin: 'kotlinx-serialization-native'
-
-def deployMode = property('native.deploy') == 'true'
-
-sourceSets {
-    main {
-        kotlin.srcDirs = ['src/main/kotlin', '../common/src/main/kotlin', '../../json/common/src']
-
-        component {
-
-            baseName = "kotlinx-serialization-runtime-native"
-
-            // todo: fixme, k/n!
-            publishJavadoc = false
-            publishSources = false
-
-            outputKinds = [KLIBRARY]
-            if (!deployMode)
-                target 'host'
-            else
-                targets = [ 'ios_arm64', 'ios_arm32', 'ios_x64', 'macos_x64', 'linux_x64', 'mingw_x64' ]
-
-            extraOpts experimentalsEnabled
-        }
-    }
-
-    test {
-        kotlin.srcDirs = ['src/test/kotlin', '../common/src/testWithNative']
-
-        component {
-            // experimantalsInTest is missing intentionally since
-            // @ImplicitReflectionSerializer does not work on Native at all
-            extraOpts experimentalsEnabled + ["-Xuse-experimental=kotlinx.serialization.UnstableDefault"]
-        }
-    }
-}
-
-
-dependencies {
-//    expectedBy project(':common')
-//    expectedBy project(':jsonparser')
-}
-
-apply plugin: 'maven-publish'
-
-def localMavenRepo = "file://${new File(System.properties['user.home'] as String)}/.m2-kotlin-native"
-publishing {
-    repositories {
-        maven {
-            url = localMavenRepo
-        }
-    }
-}
-
-apply plugin: 'com.jfrog.bintray'
-
-apply from: "${rootProject.rootDir}/gradle/bintray.gradle"
-
-bintrayUpload.doFirst {
-    publications = project.publishing.publications
-}
diff --git a/runtime/native/src/main/kotlin/kotlinx/io/Buffers.kt b/runtime/nativeMain/src/kotlinx/io/Buffers.kt
index 6acaefa5..6acaefa5 100644
--- a/runtime/native/src/main/kotlin/kotlinx/io/Buffers.kt
+++ b/runtime/nativeMain/src/kotlinx/io/Buffers.kt
diff --git a/runtime/native/src/main/kotlin/kotlinx/io/Streams.kt b/runtime/nativeMain/src/kotlinx/io/Streams.kt
index 23447439..23447439 100644
--- a/runtime/native/src/main/kotlin/kotlinx/io/Streams.kt
+++ b/runtime/nativeMain/src/kotlinx/io/Streams.kt
diff --git a/runtime/native/src/main/kotlin/kotlinx/io/Writers.kt b/runtime/nativeMain/src/kotlinx/io/Writers.kt
index b42bff31..b42bff31 100755
--- a/runtime/native/src/main/kotlin/kotlinx/io/Writers.kt
+++ b/runtime/nativeMain/src/kotlinx/io/Writers.kt
diff --git a/runtime/native/src/main/kotlin/kotlinx/serialization/Platform.kt b/runtime/nativeMain/src/kotlinx/serialization/Platform.kt
index bb575067..bb575067 100644
--- a/runtime/native/src/main/kotlin/kotlinx/serialization/Platform.kt
+++ b/runtime/nativeMain/src/kotlinx/serialization/Platform.kt
diff --git a/runtime/native/src/test/kotlin/kotlinx/serialization/JetShop.kt b/runtime/nativeTest/src/kotlinx/serialization/JetShop.kt
index a3486128..a3486128 100644
--- a/runtime/native/src/test/kotlin/kotlinx/serialization/JetShop.kt
+++ b/runtime/nativeTest/src/kotlinx/serialization/JetShop.kt
diff --git a/runtime/native/src/test/kotlin/kotlinx/serialization/NativeTest.kt b/runtime/nativeTest/src/kotlinx/serialization/NativeTest.kt
index b426b01a..b426b01a 100644
--- a/runtime/native/src/test/kotlin/kotlinx/serialization/NativeTest.kt
+++ b/runtime/nativeTest/src/kotlinx/serialization/NativeTest.kt
diff --git a/runtime/native/src/test/kotlin/kotlinx/serialization/test/CurrentPlatform.kt b/runtime/nativeTest/src/kotlinx/serialization/test/CurrentPlatform.kt
index 2691ce04..2691ce04 100644
--- a/runtime/native/src/test/kotlin/kotlinx/serialization/test/CurrentPlatform.kt
+++ b/runtime/nativeTest/src/kotlinx/serialization/test/CurrentPlatform.kt
diff --git a/runtime/jvm/src/test/proto/test_data.proto b/runtime/testProto/test_data.proto
index afa3d5fe..afa3d5fe 100644
--- a/runtime/jvm/src/test/proto/test_data.proto
+++ b/runtime/testProto/test_data.proto
diff --git a/settings.gradle b/settings.gradle
index 19ab6dc1..c37e6ce3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,18 +17,11 @@
 rootProject.name = 'kotlinx-serialization-runtime'
 enableFeaturePreview('GRADLE_METADATA')
 
-include ':common'
-include ':jvm'
-include ':js'
-include ':native'
+include ':runtime'
 
 include ':configparser'
-include ':benchmark'
-
-project(':common').projectDir = file('./runtime/common')
-project(':jvm').projectDir = file('./runtime/jvm')
-project(':js').projectDir = file('./runtime/js')
-project(':native').projectDir = file('./runtime/native')
-
 project(':configparser').projectDir = file('./formats/config')
+
+// todo: migrate benchmark to multiplatform benchmarks?
+include ':benchmark'
 project(':benchmark').projectDir = file('./benchmark')