update versions

utils/common/build.gradle

@@ -31,14 +31,14 @@ repositories {
 
 kotlin {
     jvm()
-    js()
+    js { browser() }
 
     sourceSets {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib')
-                api "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$kotlin_coroutines_version"
-                api "org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:$kotlin_serialisation_runtime_version"
+                api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+                api "org.jetbrains.kotlinx:kotlinx-serialization-core:$kotlin_serialisation_core_version"
 
                 api "com.soywiz.korlibs.klock:klock:$klockVersion"
                 api "com.benasher44:uuid:$uuidVersion"
@@ -53,10 +53,6 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
-                api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
-                api "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlin_serialisation_runtime_version"
-
-                api "javax.activation:activation:$javax_activation_version"
             }
         }
         jvmTest {
@@ -67,8 +63,6 @@ kotlin {
         jsMain {
             dependencies {
                 implementation kotlin('stdlib-js')
-                api "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$kotlin_coroutines_version"
-                api "org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:$kotlin_serialisation_runtime_version"
             }
         }
         jsTest {

utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/ByteArrayAllocator.kt

@@ -2,6 +2,9 @@ package com.insanusmokrassar.postssystem.utils.common
 
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ByteArraySerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 typealias ByteArrayAllocator = () -> ByteArray
 
@@ -10,7 +13,7 @@ object ByteArrayAllocatorSerializer : KSerializer<ByteArrayAllocator> {
     override val descriptor: SerialDescriptor = realSerializer.descriptor
 
     override fun deserialize(decoder: Decoder): ByteArrayAllocator {
-        val bytes = decoder.decode(realSerializer)
+        val bytes = realSerializer.deserialize(decoder)
         return { bytes }
     }
 

utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt

@@ -1,6 +1,9 @@
 package com.insanusmokrassar.postssystem.utils.common
 
 import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.*
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 private val mimesCache = mutableMapOf<String, MimeType>().also {
     knownMimeTypes.forEach { mimeType -> it[mimeType.raw] = mimeType }
@@ -14,7 +17,7 @@ internal fun parseMimeType(raw: String): MimeType = findBuiltinMimeType(raw) ?:
 
 @Serializer(MimeType::class)
 internal object MimeTypeSerializer : KSerializer<MimeType> {
-    override val descriptor: SerialDescriptor = PrimitiveDescriptor("mimeType", PrimitiveKind.STRING)
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("mimeType", PrimitiveKind.STRING)
 
     override fun deserialize(decoder: Decoder): MimeType {
         val mimeType = decoder.decodeString()

utils/common/src/jsMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt

@@ -1,7 +0,0 @@
-package com.insanusmokrassar.postssystem.utils.common
-
-import org.w3c.dom.get
-import kotlin.browser.window
-
-val MimeType.jsMimeType
-    get() = window.navigator.mimeTypes[raw]

utils/common/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt

@@ -1,5 +0,0 @@
-package com.insanusmokrassar.postssystem.utils.common
-
-val MimeType.asActivationMimeType: javax.activation.MimeType
-    get() = javax.activation.MimeType(raw)
-

utils/repos/common/build.gradle

@@ -31,7 +31,7 @@ repositories {
 
 kotlin {
     jvm()
-    js()
+    js { browser() }
 
     sourceSets {
         commonMain {