migration onto new ktor and other dependencies

2024-11-22 08:13:49 +00:00 · 2022-04-27 14:39:21 +06:00 · 2022-04-27 14:39:21 +06:00 · 8364020671
commit 8364020671
parent eba44cd394
31 changed files with 127 additions and 110 deletions
--- a/build.gradle
+++ b/build.gradle
@ -21,6 +21,7 @@ allprojects {
        mavenLocal()
        mavenCentral()
        google()
+        maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
    }

    // temporal crutch until legacy tests will be stabled or legacy target will be removed
--- a/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt
+++ b/common/src/commonMain/kotlin/dev/inmo/micro_utils/common/Either.kt
@ -27,13 +27,6 @@ sealed interface Either<T1, T2> {
    @Deprecated("Use optionalT2 instead", ReplaceWith("optionalT2"))
    val t2: T2?
        get() = optionalT2.dataOrNull()
-
-    companion object {
-        fun <T1, T2> serializer(
-            t1Serializer: KSerializer<T1>,
-            t2Serializer: KSerializer<T2>,
-        ): KSerializer<Either<T1, T2>> = EitherSerializer(t1Serializer, t2Serializer)
-    }
 }

 class EitherSerializer<T1, T2>(
--- a/common/src/commonTest/kotlin/dev/inmo/micro_utils/common/DiffUtilsTests.kt
+++ b/common/src/commonTest/kotlin/dev/inmo/micro_utils/common/DiffUtilsTests.kt
@ -32,7 +32,7 @@ class DiffUtilsTests {
        val withIndex = oldList.withIndex()

        for (count in 1 .. (floor(oldList.size.toFloat() / 2).toInt())) {
-            for ((i, v) in withIndex) {
+            for ((i, _) in withIndex) {
                if (i + count > oldList.lastIndex) {
                    continue
                }
@ -55,7 +55,7 @@ class DiffUtilsTests {
        val withIndex = oldList.withIndex()

        for (step in oldList.indices) {
-            for ((i, v) in withIndex) {
+            for ((i, _) in withIndex) {
                val mutable = oldList.toMutableList()
                val changes = (
                    if (step == 0) i until oldList.size else (i until oldList.size step step)
@ -104,7 +104,7 @@ class DiffUtilsTests {
        val withIndex = oldList.withIndex()

        for (count in 1 .. (floor(oldList.size.toFloat() / 2).toInt())) {
-            for ((i, v) in withIndex) {
+            for ((i, _) in withIndex) {
                if (i + count > oldList.lastIndex) {
                    continue
                }
@ -129,15 +129,20 @@ class DiffUtilsTests {
        val withIndex = oldList.withIndex()

        for (step in oldList.indices) {
-            for ((i, v) in withIndex) {
+            for ((i, _) in withIndex) {
                val mutable = oldList.toMutableList()
-                val changes = (
-                    if (step == 0) i until oldList.size else (i until oldList.size step step)
-                ).map { index ->
+
+                val newList = if (step == 0) {
+                    i until oldList.size
+                } else {
+                    i until oldList.size step step
+                }
+                newList.forEach { index ->
                    IndexedValue(index, mutable[index]) to IndexedValue(index, "changed$index").also {
                        mutable[index] = it.value
                    }
                }
+
                val mutableOldList = oldList.toMutableList()
                mutableOldList.applyDiff(mutable)
                assertEquals(
--- a/coroutines/compose/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/compose/FlowToState.kt
+++ b/coroutines/compose/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/compose/FlowToState.kt
@ -16,6 +16,7 @@ fun <T> Flow<T>.toMutableState(
    return state
 }

+@Suppress("NOTHING_TO_INLINE")
 inline fun <T> StateFlow<T>.toMutableState(
    scope: CoroutineScope
 ): MutableState<T> = toMutableState(value, scope)
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@ -46,6 +46,8 @@ ktor-server = { module = "io.ktor:ktor-server", version.ref = "ktor" }
 ktor-server-cio = { module = "io.ktor:ktor-server-cio", version.ref = "ktor" }
 ktor-server-host-common = { module = "io.ktor:ktor-server-host-common", version.ref = "ktor" }
 ktor-websockets = { module = "io.ktor:ktor-websockets", version.ref = "ktor" }
+ktor-server-websockets = { module = "io.ktor:ktor-server-websockets", version.ref = "ktor" }
+ktor-server-statusPages = { module = "io.ktor:ktor-server-status-pages", version.ref = "ktor" }


 klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "klock" }
--- a/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/FlowsWebsockets.kt
+++ b/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/FlowsWebsockets.kt
@ -3,10 +3,10 @@ package dev.inmo.micro_utils.ktor.client
 import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.micro_utils.ktor.common.*
 import io.ktor.client.HttpClient
-import io.ktor.client.features.websocket.ws
+import io.ktor.client.plugins.websocket.ws
 import io.ktor.client.request.HttpRequestBuilder
-import io.ktor.http.cio.websocket.Frame
-import io.ktor.http.cio.websocket.readBytes
+import io.ktor.websocket.Frame
+import io.ktor.websocket.readBytes
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.serialization.DeserializationStrategy
--- a/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/StandardHttpClientGetPost.kt
+++ b/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/StandardHttpClientGetPost.kt
@ -6,6 +6,7 @@ import dev.inmo.micro_utils.ktor.common.*
 import io.ktor.client.HttpClient
 import io.ktor.client.request.*
 import io.ktor.client.request.forms.*
+import io.ktor.client.statement.readBytes
 import io.ktor.http.*
 import io.ktor.utils.io.core.ByteReadPacket
 import kotlinx.serialization.*
@ -103,10 +104,10 @@ suspend fun <ResultType> HttpClient.uniget(
    url: String,
    resultDeserializer: DeserializationStrategy<ResultType>,
    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
-) = get<StandardKtorSerialInputData>(
+) = get(
    url
 ).let {
-    serialFormat.decodeDefault(resultDeserializer, it)
+    serialFormat.decodeDefault(resultDeserializer, it.readBytes())
 }


@ -123,10 +124,12 @@ suspend fun <BodyType, ResultType> HttpClient.unipost(
    bodyInfo: BodyPair<BodyType>,
    resultDeserializer: DeserializationStrategy<ResultType>,
    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
-) = post<StandardKtorSerialInputData>(url) {
-    body = serialFormat.encodeDefault(bodyInfo.first, bodyInfo.second)
+) = post(url) {
+    setBody(
+        serialFormat.encodeDefault(bodyInfo.first, bodyInfo.second)
+    )
 }.let {
-    serialFormat.decodeDefault(resultDeserializer, it)
+    serialFormat.decodeDefault(resultDeserializer, it.readBytes())
 }

 suspend fun <ResultType> HttpClient.unimultipart(
@ -139,7 +142,7 @@ suspend fun <ResultType> HttpClient.unimultipart(
    dataHeadersBuilder: HeadersBuilder.() -> Unit = {},
    requestBuilder: HttpRequestBuilder.() -> Unit = {},
    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
-): ResultType = submitFormWithBinaryData<StandardKtorSerialInputData>(
+): ResultType = submitFormWithBinaryData(
    url,
    formData = formData {
        append(
@ -155,7 +158,7 @@ suspend fun <ResultType> HttpClient.unimultipart(
    }
 ) {
    requestBuilder()
-}.let { serialFormat.decodeDefault(resultDeserializer, it) }
+}.let { serialFormat.decodeDefault(resultDeserializer, it.readBytes()) }

 suspend fun <BodyType, ResultType> HttpClient.unimultipart(
    url: String,
--- a/ktor/client/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualTemporalUpload.kt
+++ b/ktor/client/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualTemporalUpload.kt
@ -4,9 +4,10 @@ import dev.inmo.micro_utils.common.MPPFile
 import dev.inmo.micro_utils.common.filename
 import dev.inmo.micro_utils.ktor.common.TemporalFileId
 import io.ktor.client.HttpClient
-import io.ktor.client.features.onUpload
+import io.ktor.client.plugins.onUpload
 import io.ktor.client.request.forms.formData
 import io.ktor.client.request.forms.submitFormWithBinaryData
+import io.ktor.client.statement.bodyAsText
 import io.ktor.http.Headers
 import io.ktor.http.HttpHeaders
 import java.net.URLConnection
@ -20,7 +21,7 @@ actual suspend fun HttpClient.tempUpload(
    onUpload: (Long, Long) -> Unit
 ): TemporalFileId {
    val inputProvider = file.inputProvider()
-    val fileId = submitFormWithBinaryData<String>(
+    val fileId = submitFormWithBinaryData(
        fullTempUploadDraftPath,
        formData = formData {
            append(
@ -34,6 +35,6 @@ actual suspend fun HttpClient.tempUpload(
        }
    ) {
        onUpload(onUpload)
-    }
+    }.bodyAsText()
    return TemporalFileId(fileId)
 }
--- a/ktor/server/build.gradle
+++ b/ktor/server/build.gradle
@ -19,7 +19,8 @@ kotlin {
                api libs.ktor.server
                api libs.ktor.server.cio
                api libs.ktor.server.host.common
-                api libs.ktor.websockets
+                api libs.ktor.server.websockets
+                api libs.ktor.server.statusPages
            }
        }
    }
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/FlowsWebsocket.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/FlowsWebsocket.kt
@ -2,13 +2,13 @@ package dev.inmo.micro_utils.ktor.server

 import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.micro_utils.ktor.common.*
-import io.ktor.application.featureOrNull
-import io.ktor.application.install
 import io.ktor.http.URLProtocol
-import io.ktor.http.cio.websocket.*
-import io.ktor.routing.Route
-import io.ktor.routing.application
-import io.ktor.websocket.*
+import io.ktor.server.application.install
+import io.ktor.server.application.pluginOrNull
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.application
+import io.ktor.server.websocket.*
+import io.ktor.websocket.send
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.SerializationStrategy

@ -19,7 +19,7 @@ fun <T> Route.includeWebsocketHandling(
    converter: suspend WebSocketServerSession.(T) -> StandardKtorSerialInputData?
 ) {
    application.apply {
-        featureOrNull(io.ktor.websocket.WebSockets) ?: install(io.ktor.websocket.WebSockets)
+        pluginOrNull(WebSockets) ?: install(WebSockets)
    }
    webSocket(suburl, protocol.name) {
        safely {
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/ServerRoutingShortcuts.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/ServerRoutingShortcuts.kt
@ -3,25 +3,23 @@ package dev.inmo.micro_utils.ktor.server
 import dev.inmo.micro_utils.common.*
 import dev.inmo.micro_utils.coroutines.safely
 import dev.inmo.micro_utils.ktor.common.*
-import io.ktor.application.ApplicationCall
-import io.ktor.application.call
 import io.ktor.http.*
-import io.ktor.http.content.PartData
-import io.ktor.http.content.forEachPart
-import io.ktor.request.receive
-import io.ktor.request.receiveMultipart
-import io.ktor.response.respond
-import io.ktor.response.respondBytes
-import io.ktor.routing.Route
-import io.ktor.util.asStream
-import io.ktor.util.cio.writeChannel
+import io.ktor.http.content.*
+import io.ktor.server.application.ApplicationCall
+import io.ktor.server.application.call
+import io.ktor.server.request.receive
+import io.ktor.server.request.receiveMultipart
+import io.ktor.server.response.respond
+import io.ktor.server.response.respondBytes
+import io.ktor.server.routing.Route
+import io.ktor.server.websocket.WebSocketServerSession
 import io.ktor.util.pipeline.PipelineContext
-import io.ktor.utils.io.core.*
-import io.ktor.websocket.WebSocketServerSession
+import io.ktor.utils.io.core.Input
+import io.ktor.utils.io.core.use
+import io.ktor.utils.io.streams.asInput
 import kotlinx.coroutines.flow.Flow
-import kotlinx.serialization.*
-import java.io.File
-import java.io.File.createTempFile
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.SerializationStrategy

 class UnifiedRouter(
    val serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat,
@ -134,7 +132,7 @@ suspend fun ApplicationCall.uniloadMultipart(
            is PartData.FormItem -> onFormItem(it)
            is PartData.FileItem -> {
                when (it.name) {
-                    "bytes" -> resultInput = it.provider()
+                    "bytes" -> resultInput = it.streamProvider().asInput()
                    else -> onCustomFileItem(it)
                }
            }
@ -156,7 +154,7 @@ suspend fun <T> ApplicationCall.uniloadMultipart(
        onFormItem,
        {
            if (it.name == "data") {
-                data = standardKtorSerialFormat.decodeDefault(deserializer, it.provider().readBytes()).optional
+                data = standardKtorSerialFormat.decodeDefault(deserializer, it.streamProvider().readBytes()).optional
            } else {
                onCustomFileItem(it)
            }
@ -197,11 +195,13 @@ suspend fun <T> ApplicationCall.uniloadMultipartFile(
                            ".${name.extension}"
                        ).apply {
                            outputStream().use { fileStream ->
-                                it.provider().asStream().copyTo(fileStream)
+                                it.streamProvider().use {
+                                    it.copyTo(fileStream)
+                                }
                            }
                        }
                    }
-                    "data" -> data = standardKtorSerialFormat.decodeDefault(deserializer, it.provider().readBytes()).optional
+                    "data" -> data = standardKtorSerialFormat.decodeDefault(deserializer, it.streamProvider().readBytes()).optional
                    else -> onCustomFileItem(it)
                }
            }
@ -239,7 +239,9 @@ suspend fun ApplicationCall.uniloadMultipartFile(
                        ".${name.extension}"
                    ).apply {
                        outputStream().use { fileStream ->
-                            it.provider().asStream().copyTo(fileStream)
+                            it.streamProvider().use {
+                                it.copyTo(fileStream)
+                            }
                        }
                    }
                } else {
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/StartServer.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/StartServer.kt
@ -1,7 +1,7 @@
 package dev.inmo.micro_utils.ktor.server

 import dev.inmo.micro_utils.ktor.server.configurators.KtorApplicationConfigurator
-import io.ktor.application.Application
+import io.ktor.server.application.Application
 import io.ktor.server.cio.CIO
 import io.ktor.server.cio.CIOApplicationEngine
 import io.ktor.server.engine.*
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/TemporalFilesRoutingConfigurator.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/TemporalFilesRoutingConfigurator.kt
@ -7,14 +7,14 @@ import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
 import dev.inmo.micro_utils.ktor.common.DefaultTemporalFilesSubPath
 import dev.inmo.micro_utils.ktor.common.TemporalFileId
 import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator
-import io.ktor.application.call
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.content.PartData
 import io.ktor.http.content.streamProvider
-import io.ktor.request.receiveMultipart
-import io.ktor.response.respond
-import io.ktor.routing.Route
-import io.ktor.routing.post
+import io.ktor.server.application.call
+import io.ktor.server.request.receiveMultipart
+import io.ktor.server.response.respond
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.post
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.sync.Mutex
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/ApplicationCachingHeadersConfigurator.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/ApplicationCachingHeadersConfigurator.kt
@ -1,14 +1,15 @@
 package dev.inmo.micro_utils.ktor.server.configurators

-import io.ktor.application.Application
-import io.ktor.application.install
-import io.ktor.features.CachingHeaders
+import io.ktor.server.application.Application
+import io.ktor.server.application.install
+import io.ktor.server.plugins.cachingheaders.CachingHeaders
+import io.ktor.server.plugins.cachingheaders.CachingHeadersConfig
 import kotlinx.serialization.Contextual

 data class ApplicationCachingHeadersConfigurator(
    private val elements: List<@Contextual Element>
 ) : KtorApplicationConfigurator {
-    fun interface Element { operator fun CachingHeaders.Configuration.invoke() }
+    fun interface Element { operator fun CachingHeadersConfig.invoke() }

    override fun Application.configure() {
        install(CachingHeaders) {
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/ApplicationRoutingConfigurator.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/ApplicationRoutingConfigurator.kt
@ -1,8 +1,9 @@
 package dev.inmo.micro_utils.ktor.server.configurators

-import io.ktor.application.*
-import io.ktor.routing.Route
-import io.ktor.routing.Routing
+import dev.inmo.micro_utils.ktor.server.configurators.ApplicationRoutingConfigurator.Element
+import io.ktor.server.application.*
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.Routing
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable

@ -18,7 +19,7 @@ class ApplicationRoutingConfigurator(
    }

    override fun Application.configure() {
-        featureOrNull(Routing) ?.apply {
+        pluginOrNull(Routing) ?.apply {
            rootInstaller.apply { invoke() }
        } ?: install(Routing) {
            rootInstaller.apply { invoke() }
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/ApplicationSessionsConfigurator.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/ApplicationSessionsConfigurator.kt
@ -1,14 +1,15 @@
 package dev.inmo.micro_utils.ktor.server.configurators

-import io.ktor.application.Application
-import io.ktor.application.install
-import io.ktor.sessions.Sessions
+import io.ktor.server.application.Application
+import io.ktor.server.application.install
+import io.ktor.server.sessions.Sessions
+import io.ktor.server.sessions.SessionsConfig
 import kotlinx.serialization.Contextual

 class ApplicationSessionsConfigurator(
    private val elements: List<@Contextual Element>
 ) : KtorApplicationConfigurator {
-    fun interface Element { operator fun Sessions.Configuration.invoke() }
+    fun interface Element { operator fun SessionsConfig.invoke() }

    override fun Application.configure() {
        install(Sessions) {
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/KtorApplicationConfigurator.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/KtorApplicationConfigurator.kt
@ -1,6 +1,6 @@
 package dev.inmo.micro_utils.ktor.server.configurators

-import io.ktor.application.Application
+import io.ktor.server.application.Application

 interface KtorApplicationConfigurator {
    fun Application.configure()
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/StatusPagesConfigurator.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/configurators/StatusPagesConfigurator.kt
@ -1,14 +1,15 @@
 package dev.inmo.micro_utils.ktor.server.configurators

-import io.ktor.application.Application
-import io.ktor.application.install
-import io.ktor.features.StatusPages
+import io.ktor.server.application.Application
+import io.ktor.server.application.install
+import io.ktor.server.plugins.statuspages.StatusPages
+import io.ktor.server.plugins.statuspages.StatusPagesConfig
 import kotlinx.serialization.Contextual

 class StatusPagesConfigurator(
    private val elements: List<@Contextual Element>
 ) : KtorApplicationConfigurator {
-    fun interface Element { operator fun StatusPages.Configuration.invoke() }
+    fun interface Element { operator fun StatusPagesConfig.invoke() }

    override fun Application.configure() {
        install(StatusPages) {
--- a/language_codes/generator/src/main/kotlin/Main.kt
+++ b/language_codes/generator/src/main/kotlin/Main.kt
@ -1,5 +1,6 @@
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
+import io.ktor.client.statement.bodyAsText
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.ListSerializer
@ -164,7 +165,7 @@ suspend fun main(vararg args: String) {

    val ietfLanguageCodes = json.decodeFromString(
        ListSerializer(LanguageCode.serializer()),
-        client.get(ietfLanguageCodesLink)
+        client.get(ietfLanguageCodesLink).bodyAsText()
    ).map {
        it.copy(
            title = it.title
@ -175,7 +176,7 @@ suspend fun main(vararg args: String) {
    }
    val ietfLanguageCodesWithTagsMap = json.decodeFromString(
        ListSerializer(LanguageCodeWithTag.serializer()),
-        client.get(ietfLanguageCodesAdditionalTagsLink)
+        client.get(ietfLanguageCodesAdditionalTagsLink).bodyAsText()
    ).filter { it.withSubtag != it.tag }.groupBy { it.tag }

    val tags = ietfLanguageCodes.map {
--- a/mime_types/src/commonMain/kotlin/dev/inmo/micro_utils/mime_types/MimeTypeTools.kt
+++ b/mime_types/src/commonMain/kotlin/dev/inmo/micro_utils/mime_types/MimeTypeTools.kt
@ -1,7 +1,6 @@
 package dev.inmo.micro_utils.mime_types

-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.Serializer
+import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.*
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
@ -16,6 +15,7 @@ fun mimeType(raw: String) = mimesCache.getOrPut(raw) {

 internal fun parseMimeType(raw: String): MimeType = CustomMimeType(raw)

+@Suppress("OPT_IN_USAGE")
@Serializer(MimeType::class)
 object MimeTypeSerializer : KSerializer<MimeType> {
    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("mimeType", PrimitiveKind.STRING)
--- a/pagination/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/pagination/ServerPaginationHelpers.kt
+++ b/pagination/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/pagination/ServerPaginationHelpers.kt
@ -1,7 +1,7 @@
 package dev.inmo.micro_utils.pagination

-import io.ktor.application.ApplicationCall
 import io.ktor.http.Parameters
+import io.ktor.server.application.ApplicationCall

 val Parameters.extractPagination: Pagination
    get() = SimplePagination(
--- a/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorReadStandardCrudRepo.kt
+++ b/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorReadStandardCrudRepo.kt
@ -7,10 +7,10 @@ import dev.inmo.micro_utils.pagination.PaginationResult
 import dev.inmo.micro_utils.pagination.extractPagination
 import dev.inmo.micro_utils.repos.ReadStandardCRUDRepo
 import dev.inmo.micro_utils.repos.ktor.common.crud.*
-import io.ktor.application.call
 import io.ktor.http.ContentType
-import io.ktor.routing.Route
-import io.ktor.routing.get
+import io.ktor.server.application.call
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.get
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer

--- a/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorStandardCrudRepo.kt
+++ b/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorStandardCrudRepo.kt
@ -6,8 +6,8 @@ import dev.inmo.micro_utils.ktor.server.UnifiedRouter
 import dev.inmo.micro_utils.ktor.server.standardKtorSerialFormatContentType
 import dev.inmo.micro_utils.repos.StandardCRUDRepo
 import io.ktor.http.ContentType
-import io.ktor.routing.Route
-import io.ktor.routing.route
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.route
 import kotlinx.serialization.KSerializer

 fun <ObjectType, IdType, InputValue> Route.configureStandardCrudRepoRoutes(
--- a/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorWriteStandardCrudRepo.kt
+++ b/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorWriteStandardCrudRepo.kt
@ -5,10 +5,9 @@ import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.server.*
 import dev.inmo.micro_utils.repos.WriteStandardCRUDRepo
 import dev.inmo.micro_utils.repos.ktor.common.crud.*
-import io.ktor.application.call
 import io.ktor.http.ContentType
-import io.ktor.routing.Route
-import io.ktor.routing.post
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.post
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.*

--- a/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/KtorStandartKeyValueRepo.kt
+++ b/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/KtorStandartKeyValueRepo.kt
@ -6,8 +6,8 @@ import dev.inmo.micro_utils.ktor.server.UnifiedRouter
 import dev.inmo.micro_utils.ktor.server.standardKtorSerialFormatContentType
 import dev.inmo.micro_utils.repos.StandardKeyValueRepo
 import io.ktor.http.ContentType
-import io.ktor.routing.Route
-import io.ktor.routing.route
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.route
 import kotlinx.serialization.KSerializer

 fun <K, V> Route.configureStandardKeyValueRepoRoutes(
@ -43,4 +43,4 @@ fun <K, V> Route.configureStandartKeyValueRepoRoutes(
    valueNullableSerializer: KSerializer<V?>,
    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat,
    serialFormatContentType: ContentType = standardKtorSerialFormatContentType
-) = configureStandardKeyValueRepoRoutes(baseSubpart, originalRepo, keySerializer, valueSerializer, valueNullableSerializer, UnifiedRouter(serialFormat, serialFormatContentType))
+) = configureStandardKeyValueRepoRoutes(baseSubpart, originalRepo, keySerializer, valueSerializer, valueNullableSerializer, UnifiedRouter(serialFormat, serialFormatContentType))
--- a/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/KtorStandartReadKeyValueRepo.kt
+++ b/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/KtorStandartReadKeyValueRepo.kt
@ -8,10 +8,10 @@ import dev.inmo.micro_utils.pagination.extractPagination
 import dev.inmo.micro_utils.repos.ReadStandardKeyValueRepo
 import dev.inmo.micro_utils.repos.ktor.common.key_value.*
 import dev.inmo.micro_utils.repos.ktor.common.valueParameterName
-import io.ktor.application.call
 import io.ktor.http.ContentType
-import io.ktor.routing.Route
-import io.ktor.routing.get
+import io.ktor.server.application.call
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.get
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer

--- a/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/KtorStandartWriteKeyValueRepo.kt
+++ b/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/KtorStandartWriteKeyValueRepo.kt
@ -6,8 +6,8 @@ import dev.inmo.micro_utils.ktor.server.*
 import dev.inmo.micro_utils.repos.WriteStandardKeyValueRepo
 import dev.inmo.micro_utils.repos.ktor.common.key_value.*
 import io.ktor.http.ContentType
-import io.ktor.routing.Route
-import io.ktor.routing.post
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.post
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.*

--- a/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/one_to_many/ConfigureOneToManyKeyValueRepoRoutes.kt
+++ b/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/one_to_many/ConfigureOneToManyKeyValueRepoRoutes.kt
@ -6,8 +6,8 @@ import dev.inmo.micro_utils.ktor.server.UnifiedRouter
 import dev.inmo.micro_utils.ktor.server.standardKtorSerialFormatContentType
 import dev.inmo.micro_utils.repos.OneToManyKeyValueRepo
 import io.ktor.http.ContentType
-import io.ktor.routing.Route
-import io.ktor.routing.route
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.route
 import kotlinx.serialization.KSerializer

 fun <Key, Value> Route.configureOneToManyKeyValueRepoRoutes(
@ -32,4 +32,4 @@ fun <Key, Value> Route.configureOneToManyKeyValueRepoRoutes(
    serialFormatContentType: ContentType = standardKtorSerialFormatContentType
 ) = configureOneToManyKeyValueRepoRoutes(
    baseSubpart, originalRepo, keySerializer, valueSerializer, UnifiedRouter(serialFormat, serialFormatContentType)
-)
+)
--- a/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/one_to_many/ConfigureOneToManyReadKeyValueRepoRoutes.kt
+++ b/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/one_to_many/ConfigureOneToManyReadKeyValueRepoRoutes.kt
@ -6,15 +6,14 @@ import dev.inmo.micro_utils.ktor.server.*
 import dev.inmo.micro_utils.pagination.PaginationResult
 import dev.inmo.micro_utils.pagination.extractPagination
 import dev.inmo.micro_utils.repos.ReadOneToManyKeyValueRepo
-import dev.inmo.micro_utils.repos.ktor.common.*
 import dev.inmo.micro_utils.repos.ktor.common.keyParameterName
 import dev.inmo.micro_utils.repos.ktor.common.one_to_many.*
 import dev.inmo.micro_utils.repos.ktor.common.valueParameterName
 import dev.inmo.micro_utils.repos.ktor.common.reversedParameterName
-import io.ktor.application.call
 import io.ktor.http.ContentType
-import io.ktor.routing.Route
-import io.ktor.routing.get
+import io.ktor.server.application.call
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.get
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer

--- a/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/one_to_many/ConfigureOneToManyWriteKeyValueRepoRoutes.kt
+++ b/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/one_to_many/ConfigureOneToManyWriteKeyValueRepoRoutes.kt
@ -5,10 +5,9 @@ import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.server.*
 import dev.inmo.micro_utils.repos.WriteOneToManyKeyValueRepo
 import dev.inmo.micro_utils.repos.ktor.common.one_to_many.*
-import io.ktor.application.call
 import io.ktor.http.ContentType
-import io.ktor.routing.Route
-import io.ktor.routing.post
+import io.ktor.server.routing.Route
+import io.ktor.server.routing.post
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.*

--- a/settings.gradle
+++ b/settings.gradle
@ -1,3 +1,9 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+}
+
 rootProject.name='micro_utils'

 String[] includes = [