diff --git a/core/api/build.gradle b/core/api/build.gradle index 539c431e..6174cd6e 100644 --- a/core/api/build.gradle +++ b/core/api/build.gradle @@ -31,12 +31,13 @@ repositories { kotlin { jvm() - js() + js { browser() } sourceSets { commonMain { dependencies { implementation kotlin('stdlib') + api kotlin('reflect') if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") { api "com.insanusmokrassar:postssystem.utils.common:$core_version" diff --git a/core/api/src/commonTest/kotlin/com/insanusmokrassar/postssystem/core/api/ContentSerialization.kt b/core/api/src/commonTest/kotlin/com/insanusmokrassar/postssystem/core/api/ContentSerialization.kt index 96c98751..31617964 100644 --- a/core/api/src/commonTest/kotlin/com/insanusmokrassar/postssystem/core/api/ContentSerialization.kt +++ b/core/api/src/commonTest/kotlin/com/insanusmokrassar/postssystem/core/api/ContentSerialization.kt @@ -26,11 +26,11 @@ class ContentSerialization { } val stringified = registeredContentFakes.map { - Json.stringify(RegisteredContent.serializer(), it) + Json.encodeToString(RegisteredContent.serializer(), it) } val parsed = stringified.map { - Json.parse(RegisteredContent.serializer(), it) + Json.decodeFromString(RegisteredContent.serializer(), it) } parsed.forEachIndexed { i, registeredContent -> assertEquals(registeredContentFakes[i], registeredContent) } diff --git a/core/ktor/client/build.gradle b/core/ktor/client/build.gradle index 6f6a4456..a6c1507f 100644 --- a/core/ktor/client/build.gradle +++ b/core/ktor/client/build.gradle @@ -31,7 +31,7 @@ repositories { kotlin { jvm() - js() + js { browser() } sourceSets { commonMain { diff --git a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/ReadContentRepoKtorClient.kt b/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/ReadContentRepoKtorClient.kt index 4ec4c212..ec0abcbe 100644 --- a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/ReadContentRepoKtorClient.kt +++ b/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/ReadContentRepoKtorClient.kt @@ -19,7 +19,7 @@ class ReadContentRepoKtorClient( override suspend fun getContentsIds(): Set = client.get( "$baseUrl/$getContentsIdsRoute" ).let { - standardKtorSerialFormat.load(contentIdsSerializer, it) + standardKtorSerialFormat.decodeFromByteArray(contentIdsSerializer, it) } override suspend fun getContentById(id: ContentId): RegisteredContent? = client.uniget( diff --git a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/WriteContentRepoKtorClient.kt b/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/WriteContentRepoKtorClient.kt index a7b71515..b86bd1b8 100644 --- a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/WriteContentRepoKtorClient.kt +++ b/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/content/WriteContentRepoKtorClient.kt @@ -17,13 +17,13 @@ class WriteContentRepoKtorClient( override val contentCreatedFlow: Flow = client.createStandardWebsocketFlow( "$baseUrl/$contentCreatedFlowRoute" ) { - standardKtorSerialFormat.load(RegisteredContent.serializer(), it) + standardKtorSerialFormat.decodeFromByteArray(RegisteredContent.serializer(), it) } override val contentDeletedFlow: Flow = client.createStandardWebsocketFlow( "$baseUrl/$contentDeletedFlowRoute" ) { - standardKtorSerialFormat.load(RegisteredContent.serializer(), it) + standardKtorSerialFormat.decodeFromByteArray(RegisteredContent.serializer(), it) } override suspend fun registerContent(content: Content): RegisteredContent? = client.unipost( diff --git a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt b/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt index 768253f0..ba88f0a6 100644 --- a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt +++ b/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/ReadPostsRepoKtorClient.kt @@ -21,7 +21,7 @@ class ReadPostsRepoKtorClient( override suspend fun getPostsIds(): Set = client.get( "$baseUrl/$getPostsIdsRoute" ).let { - standardKtorSerialFormat.load(postIdsSerializer, it) + standardKtorSerialFormat.decodeFromByteArray(postIdsSerializer, it) } override suspend fun getPostById(id: PostId): RegisteredPost? = client.uniget( diff --git a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/WritePostsRepoKtorClient.kt b/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/WritePostsRepoKtorClient.kt index 3a9aed1f..9ac42430 100644 --- a/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/WritePostsRepoKtorClient.kt +++ b/core/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/core/ktor/client/post/WritePostsRepoKtorClient.kt @@ -20,17 +20,17 @@ class WritePostsRepoKtorClient ( override val postCreatedFlow: Flow = client.createStandardWebsocketFlow( "$baseUrl/$postCreatedFlowRoute" ) { - standardKtorSerialFormat.load(RegisteredPost.serializer(), it) + standardKtorSerialFormat.decodeFromByteArray(RegisteredPost.serializer(), it) } override val postDeletedFlow: Flow = client.createStandardWebsocketFlow( "$baseUrl/$postDeletedFlowRoute" ) { - standardKtorSerialFormat.load(RegisteredPost.serializer(), it) + standardKtorSerialFormat.decodeFromByteArray(RegisteredPost.serializer(), it) } override val postUpdatedFlow: Flow = client.createStandardWebsocketFlow( "$baseUrl/$postUpdatedFlowRoute" ) { - standardKtorSerialFormat.load(RegisteredPost.serializer(), it) + standardKtorSerialFormat.decodeFromByteArray(RegisteredPost.serializer(), it) } override suspend fun createPost(post: Post): RegisteredPost? = client.unipost( diff --git a/core/ktor/common/build.gradle b/core/ktor/common/build.gradle index 5a8f7c1b..f96452bc 100644 --- a/core/ktor/common/build.gradle +++ b/core/ktor/common/build.gradle @@ -31,7 +31,7 @@ repositories { kotlin { jvm() - js() + js { browser() } sourceSets { commonMain { diff --git a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt b/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt index 6d14145e..a40f3d4e 100644 --- a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt +++ b/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/content/WriteContentRepoRoutingConfigurator.kt @@ -16,10 +16,10 @@ fun Route.configureWriteContentRepoRoutes( proxyTo: WriteContentRepo ) { includeWebsocketHandling(contentCreatedFlowRoute, proxyTo.contentCreatedFlow) { - standardKtorSerialFormat.dump(RegisteredContent.serializer(), it) + standardKtorSerialFormat.encodeToByteArray(RegisteredContent.serializer(), it) } includeWebsocketHandling(contentDeletedFlowRoute, proxyTo.contentDeletedFlow) { - standardKtorSerialFormat.dump(RegisteredContent.serializer(), it) + standardKtorSerialFormat.encodeToByteArray(RegisteredContent.serializer(), it) } post(registerContentRoute) { val content = call.uniload(Content.serializer()) diff --git a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt b/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt index 68eb1f6a..6a82e2c3 100644 --- a/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt +++ b/core/ktor/server/src/main/kotlin/com/insanusmokrassar/postssystem/core/ktor/server/post/WritePostsRepoRoutingConfigurator.kt @@ -16,13 +16,13 @@ fun Route.configureWritePostsRepoRoutes( proxyTo: WritePostsRepo ) { includeWebsocketHandling(postCreatedFlowRoute, proxyTo.postCreatedFlow) { - standardKtorSerialFormat.dump(RegisteredPost.serializer(), it) + standardKtorSerialFormat.encodeToByteArray(RegisteredPost.serializer(), it) } includeWebsocketHandling(postDeletedFlowRoute, proxyTo.postDeletedFlow) { - standardKtorSerialFormat.dump(RegisteredPost.serializer(), it) + standardKtorSerialFormat.encodeToByteArray(RegisteredPost.serializer(), it) } includeWebsocketHandling(postUpdatedFlowRoute, proxyTo.postUpdatedFlow) { - standardKtorSerialFormat.dump(RegisteredPost.serializer(), it) + standardKtorSerialFormat.encodeToByteArray(RegisteredPost.serializer(), it) } post(createPostRoute) { diff --git a/gradle.properties b/gradle.properties index a247c68e..6364fc3c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,19 @@ kotlin.code.style=official org.gradle.parallel=true -kotlin_version=1.3.72 -kotlin_coroutines_version=1.3.8 -kotlin_serialisation_runtime_version=0.20.0 +kotlin_version=1.4.0 +kotlin_coroutines_version=1.3.9 +kotlin_serialisation_core_version=1.0.0-RC -ktor_version=1.3.2 +ktor_version=1.3.2-1.4.0-rc -klockVersion=1.11.14 -uuidVersion=0.1.1 +klockVersion=1.12.0 +uuidVersion=0.2.0 exposed_version=0.26.2 test_sqlite_version=3.32.3.2 javax_activation_version=1.1.1 -gradle_bintray_plugin_version=1.8.4 +gradle_bintray_plugin_version=1.8.5 -core_version=0.4.2 +core_version=0.5.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 492d706a..727d0a77 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/ktor/client/build.gradle b/ktor/client/build.gradle index d129348b..d6605eb4 100644 --- a/ktor/client/build.gradle +++ b/ktor/client/build.gradle @@ -31,7 +31,7 @@ repositories { kotlin { jvm() - js() + js { browser() } sourceSets { commonMain { diff --git a/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/client/StandardHttpClientGetPost.kt b/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/client/StandardHttpClientGetPost.kt index 06b042fe..77e38e75 100644 --- a/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/client/StandardHttpClientGetPost.kt +++ b/ktor/client/src/commonMain/kotlin/com/insanusmokrassar/postssystem/ktor/client/StandardHttpClientGetPost.kt @@ -15,7 +15,7 @@ suspend fun HttpClient.uniget( ) = get( url ).let { - standardKtorSerialFormat.load(resultDeserializer, it) + standardKtorSerialFormat.decodeFromByteArray(resultDeserializer, it) } suspend fun HttpClient.unipost( @@ -23,7 +23,7 @@ suspend fun HttpClient.unipost( bodyInfo: BodyPair, resultDeserializer: DeserializationStrategy ) = post(url) { - body = standardKtorSerialFormat.dump(bodyInfo.first, bodyInfo.second) + body = standardKtorSerialFormat.encodeToByteArray(bodyInfo.first, bodyInfo.second) }.let { - standardKtorSerialFormat.load(resultDeserializer, it) + standardKtorSerialFormat.decodeFromByteArray(resultDeserializer, it) } diff --git a/ktor/common/build.gradle b/ktor/common/build.gradle index e4f37a32..768e3839 100644 --- a/ktor/common/build.gradle +++ b/ktor/common/build.gradle @@ -31,14 +31,14 @@ repositories { kotlin { jvm() - js() + js { browser() } sourceSets { commonMain { dependencies { implementation kotlin('stdlib') - api "org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:$kotlin_serialisation_runtime_version" - api "org.jetbrains.kotlinx:kotlinx-serialization-cbor-common:$kotlin_serialisation_runtime_version" + api "org.jetbrains.kotlinx:kotlinx-serialization-core:$kotlin_serialisation_core_version" + api "org.jetbrains.kotlinx:kotlinx-serialization-cbor:$kotlin_serialisation_core_version" api projectByName("postssystem.utils.common") } @@ -52,8 +52,7 @@ kotlin { jvmMain { dependencies { implementation kotlin('stdlib-jdk8') - api "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlin_serialisation_runtime_version" - api "org.jetbrains.kotlinx:kotlinx-serialization-cbor:$kotlin_serialisation_runtime_version" +// api "org.jetbrains.kotlinx:kotlinx-serialization-cbor:$kotlin_serialisation_core_version" } } jvmTest { @@ -64,8 +63,7 @@ kotlin { jsMain { dependencies { implementation kotlin('stdlib-js') - api "org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:$kotlin_serialisation_runtime_version" - api "org.jetbrains.kotlinx:kotlinx-serialization-cbor-js:$kotlin_serialisation_runtime_version" +// api "org.jetbrains.kotlinx:kotlinx-serialization-cbor-js:$kotlin_serialisation_core_version" } } jsTest { diff --git a/ktor/server/build.gradle b/ktor/server/build.gradle index 21dd6bd4..4321b01d 100644 --- a/ktor/server/build.gradle +++ b/ktor/server/build.gradle @@ -36,7 +36,7 @@ kotlin { commonMain { dependencies { implementation kotlin('stdlib') - api "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$kotlin_coroutines_version" + api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version" api projectByName("postssystem.ktor.common") } @@ -50,9 +50,6 @@ kotlin { jvmMain { dependencies { - api "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlin_serialisation_runtime_version" - api "org.jetbrains.kotlinx:kotlinx-serialization-properties:$kotlin_serialisation_runtime_version" - api "io.ktor:ktor-server:$ktor_version" api "io.ktor:ktor-server-host-common:$ktor_version" api "io.ktor:ktor-server-netty:$ktor_version" diff --git a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/ServerRoutingShortcuts.kt b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/ServerRoutingShortcuts.kt index 906e3321..5948ac49 100644 --- a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/ServerRoutingShortcuts.kt +++ b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/ServerRoutingShortcuts.kt @@ -14,14 +14,14 @@ suspend fun ApplicationCall.unianswer( answer: T ) { respondBytes( - standardKtorSerialFormat.dump(answerSerializer, answer), + standardKtorSerialFormat.encodeToByteArray(answerSerializer, answer), standardKtorSerialFormatContentType ) } suspend fun ApplicationCall.uniload( deserializer: DeserializationStrategy -) = standardKtorSerialFormat.load( +) = standardKtorSerialFormat.decodeFromByteArray( deserializer, request.receiveChannel().toByteArray() ) diff --git a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationCachingHeadersConfigurator.kt b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationCachingHeadersConfigurator.kt index e45a0789..f62c8bcb 100644 --- a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationCachingHeadersConfigurator.kt +++ b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationCachingHeadersConfigurator.kt @@ -3,10 +3,10 @@ package com.insanusmokrassar.postssystem.ktor.server.configurators import io.ktor.application.Application import io.ktor.application.install import io.ktor.features.CachingHeaders -import kotlinx.serialization.ContextualSerialization +import kotlinx.serialization.Contextual data class ApplicationCachingHeadersConfigurator( - private val elements: List<@ContextualSerialization Element> + private val elements: List<@Contextual Element> ) : KtorApplicationConfigurator{ interface Element { operator fun CachingHeaders.Configuration.invoke() } diff --git a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationRoutingConfigurator.kt b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationRoutingConfigurator.kt index 8ec15a65..48e62e28 100644 --- a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationRoutingConfigurator.kt +++ b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationRoutingConfigurator.kt @@ -3,12 +3,12 @@ package com.insanusmokrassar.postssystem.ktor.server.configurators import io.ktor.application.* import io.ktor.routing.Route import io.ktor.routing.Routing -import kotlinx.serialization.ContextualSerialization +import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable @Serializable class ApplicationRoutingConfigurator( - private val elements: List<@ContextualSerialization Element> + private val elements: List<@Contextual Element> ) : KtorApplicationConfigurator { interface Element { operator fun Route.invoke() } diff --git a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationSessionsConfigurator.kt b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationSessionsConfigurator.kt index 9245f738..c2012a59 100644 --- a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationSessionsConfigurator.kt +++ b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/ApplicationSessionsConfigurator.kt @@ -3,10 +3,10 @@ package com.insanusmokrassar.postssystem.ktor.server.configurators import io.ktor.application.Application import io.ktor.application.install import io.ktor.sessions.Sessions -import kotlinx.serialization.ContextualSerialization +import kotlinx.serialization.Contextual class ApplicationSessionsConfigurator( - private val elements: List<@ContextualSerialization Element> + private val elements: List<@Contextual Element> ) : KtorApplicationConfigurator { interface Element { operator fun Sessions.Configuration.invoke() } diff --git a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/StatusPagesConfigurator.kt b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/StatusPagesConfigurator.kt index aa2c5289..ebb5bc5c 100644 --- a/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/StatusPagesConfigurator.kt +++ b/ktor/server/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/ktor/server/configurators/StatusPagesConfigurator.kt @@ -3,10 +3,10 @@ package com.insanusmokrassar.postssystem.ktor.server.configurators import io.ktor.application.Application import io.ktor.application.install import io.ktor.features.StatusPages -import kotlinx.serialization.ContextualSerialization +import kotlinx.serialization.* class StatusPagesConfigurator( - private val elements: List<@ContextualSerialization Element> + private val elements: List<@Contextual Element> ) : KtorApplicationConfigurator { interface Element { operator fun StatusPages.Configuration.invoke() } diff --git a/ktor/tests/src/test/kotlin/com/insanusmokrassar/postssystem/ktor/tests/WebsocketsTest.kt b/ktor/tests/src/test/kotlin/com/insanusmokrassar/postssystem/ktor/tests/WebsocketsTest.kt index c94c495f..c7278418 100644 --- a/ktor/tests/src/test/kotlin/com/insanusmokrassar/postssystem/ktor/tests/WebsocketsTest.kt +++ b/ktor/tests/src/test/kotlin/com/insanusmokrassar/postssystem/ktor/tests/WebsocketsTest.kt @@ -28,7 +28,7 @@ class WebsocketsTest { install(WebSockets) routing { includeWebsocketHandling(suburl, dataFlow) { - standardKtorSerialFormat.dump(Int.serializer(), it) + standardKtorSerialFormat.encodeToByteArray(Int.serializer(), it) } } }.also { @@ -44,7 +44,7 @@ class WebsocketsTest { "$serverUrl/$suburl", { false } // always skip reconnection ) { - standardKtorSerialFormat.load(Int.serializer(), it) + standardKtorSerialFormat.decodeFromByteArray(Int.serializer(), it) } var currentlyCheckingData: Int? = null diff --git a/markups/commons/build.gradle b/markups/commons/build.gradle index 106eb991..b96dc010 100644 --- a/markups/commons/build.gradle +++ b/markups/commons/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" if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") { api "com.insanusmokrassar:postssystem.core.api:$core_version" @@ -59,8 +59,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" } } jvmTest { @@ -71,8 +69,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 { diff --git a/markups/html/build.gradle b/markups/html/build.gradle index 74947d60..08d47f54 100644 --- a/markups/html/build.gradle +++ b/markups/html/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" if ((project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true") { api "com.insanusmokrassar:postssystem.markups.core:$core_version" @@ -56,9 +56,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 "org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinx_html_version" } } @@ -70,9 +67,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" - api "org.jetbrains.kotlinx:kotlinx-html-js:$kotlinx_html_version" } } diff --git a/publishing/api/build.gradle b/publishing/api/build.gradle index 5590f780..feb7352b 100644 --- a/publishing/api/build.gradle +++ b/publishing/api/build.gradle @@ -31,7 +31,7 @@ repositories { kotlin { jvm() - js() + js { browser() } sourceSets { commonMain { diff --git a/publishing/ktor/client/build.gradle b/publishing/ktor/client/build.gradle index 4fef490f..94f454a6 100644 --- a/publishing/ktor/client/build.gradle +++ b/publishing/ktor/client/build.gradle @@ -31,7 +31,7 @@ repositories { kotlin { jvm() - js() + js { browser() } sourceSets { commonMain { diff --git a/publishing/ktor/common/build.gradle b/publishing/ktor/common/build.gradle index cbd356ff..a7e7969b 100644 --- a/publishing/ktor/common/build.gradle +++ b/publishing/ktor/common/build.gradle @@ -29,7 +29,7 @@ repositories { kotlin { jvm() - js() + js { browser() } sourceSets { commonMain { diff --git a/utils/common/build.gradle b/utils/common/build.gradle index 153dcd0b..6e6718b6 100644 --- a/utils/common/build.gradle +++ b/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 { diff --git a/utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/ByteArrayAllocator.kt b/utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/ByteArrayAllocator.kt index 4ce5f986..bd9c11c1 100644 --- a/utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/ByteArrayAllocator.kt +++ b/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 { override val descriptor: SerialDescriptor = realSerializer.descriptor override fun deserialize(decoder: Decoder): ByteArrayAllocator { - val bytes = decoder.decode(realSerializer) + val bytes = realSerializer.deserialize(decoder) return { bytes } } diff --git a/utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt b/utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt index 278c4e86..125c7d0b 100644 --- a/utils/common/src/commonMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt +++ b/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().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 { - 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() diff --git a/utils/common/src/jsMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt b/utils/common/src/jsMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt deleted file mode 100644 index c31a426d..00000000 --- a/utils/common/src/jsMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt +++ /dev/null @@ -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] diff --git a/utils/common/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt b/utils/common/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt deleted file mode 100644 index b7638cbb..00000000 --- a/utils/common/src/jvmMain/kotlin/com/insanusmokrassar/postssystem/utils/common/MimeTypeTools.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.insanusmokrassar.postssystem.utils.common - -val MimeType.asActivationMimeType: javax.activation.MimeType - get() = javax.activation.MimeType(raw) - diff --git a/utils/repos/common/build.gradle b/utils/repos/common/build.gradle index e5c52d1d..16f73bd2 100644 --- a/utils/repos/common/build.gradle +++ b/utils/repos/common/build.gradle @@ -31,7 +31,7 @@ repositories { kotlin { jvm() - js() + js { browser() } sourceSets { commonMain {