chore: ktor 3.0.0-beta-1

programadorthi · Jan 13, 2024 · 2b24f2d · 2b24f2d
1 parent f40817c
commit 2b24f2d
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 21 deletions.
diff --git a/auth/common/src/dev/programadorthi/routing/auth/Authentication.kt b/auth/common/src/dev/programadorthi/routing/auth/Authentication.kt
@@ -10,7 +10,7 @@ import dev.programadorthi.routing.core.application.BaseApplicationPlugin
 import dev.programadorthi.routing.core.application.install
 import dev.programadorthi.routing.core.application.pluginOrNull
 import io.ktor.util.AttributeKey
-import io.ktor.util.KtorDsl
+import io.ktor.utils.io.KtorDsl
 
 /**
  * A configuration for the [Authentication] plugin.

diff --git a/auth/common/src/dev/programadorthi/routing/auth/AuthenticationInterceptors.kt b/auth/common/src/dev/programadorthi/routing/auth/AuthenticationInterceptors.kt
@@ -21,8 +21,8 @@ import dev.programadorthi.routing.core.application.plugin
 import dev.programadorthi.routing.core.application.pluginOrNull
 import dev.programadorthi.routing.core.asRouting
 import io.ktor.util.AttributeKey
-import io.ktor.util.KtorDsl
 import io.ktor.util.pipeline.PipelinePhase
+import io.ktor.utils.io.KtorDsl
 
 internal object AuthenticationHook : Hook<suspend (ApplicationCall) -> Unit> {
     internal val AuthenticatePhase: PipelinePhase = PipelinePhase("Authenticate")

diff --git a/call-logging/common/src/dev/programadorthi/routing/callloging/CallLoggingConfig.kt b/call-logging/common/src/dev/programadorthi/routing/callloging/CallLoggingConfig.kt
@@ -5,9 +5,9 @@
 package dev.programadorthi.routing.callloging
 
 import dev.programadorthi.routing.core.application.ApplicationCall
-import io.ktor.util.KtorDsl
 import io.ktor.util.date.getTimeMillis
 import io.ktor.util.logging.Logger
+import io.ktor.utils.io.KtorDsl
 
 /**
  * A configuration for the [CallLogging] plugin.

diff --git a/compose/common/src/dev/programadorthi/routing/compose/ComposeRoutingBuilder.kt b/compose/common/src/dev/programadorthi/routing/compose/ComposeRoutingBuilder.kt
@@ -10,8 +10,8 @@ import dev.programadorthi.routing.core.method
 import dev.programadorthi.routing.core.route
 import dev.programadorthi.routing.resources.handle
 import dev.programadorthi.routing.resources.resource
-import io.ktor.util.KtorDsl
 import io.ktor.util.pipeline.PipelineContext
+import io.ktor.utils.io.KtorDsl
 import kotlinx.serialization.serializer
 
 @KtorDsl

diff --git a/core-stack/common/src/dev/programadorthi/routing/core/StackManager.kt b/core-stack/common/src/dev/programadorthi/routing/core/StackManager.kt
@@ -13,8 +13,8 @@ import io.ktor.http.Parameters
 import io.ktor.http.parametersOf
 import io.ktor.util.AttributeKey
 import io.ktor.util.Attributes
-import io.ktor.util.KtorDsl
 import io.ktor.util.putAll
+import io.ktor.utils.io.KtorDsl
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 

diff --git a/core/common/src/dev/programadorthi/routing/core/RegexRouting.kt b/core/common/src/dev/programadorthi/routing/core/RegexRouting.kt
@@ -6,8 +6,8 @@ package dev.programadorthi.routing.core
 
 import dev.programadorthi.routing.core.application.ApplicationCall
 import io.ktor.http.Parameters
-import io.ktor.util.KtorDsl
 import io.ktor.util.pipeline.PipelineInterceptor
+import io.ktor.utils.io.KtorDsl
 
 /**
  * Builds a route to match the specified regex [path].

diff --git a/core/common/src/dev/programadorthi/routing/core/Route.kt b/core/common/src/dev/programadorthi/routing/core/Route.kt
@@ -7,8 +7,8 @@ package dev.programadorthi.routing.core
 import dev.programadorthi.routing.core.application.ApplicationCall
 import dev.programadorthi.routing.core.application.ApplicationCallPipeline
 import dev.programadorthi.routing.core.application.ApplicationEnvironment
-import io.ktor.util.KtorDsl
 import io.ktor.util.pipeline.PipelineInterceptor
+import io.ktor.utils.io.KtorDsl
 
 /**
  * Describes a node in a routing tree.

diff --git a/core/common/src/dev/programadorthi/routing/core/Routing.kt b/core/common/src/dev/programadorthi/routing/core/Routing.kt
@@ -26,12 +26,12 @@ import io.ktor.http.Url
 import io.ktor.http.plus
 import io.ktor.util.AttributeKey
 import io.ktor.util.Attributes
-import io.ktor.util.KtorDsl
 import io.ktor.util.logging.KtorSimpleLogger
 import io.ktor.util.logging.Logger
 import io.ktor.util.logging.isTraceEnabled
 import io.ktor.util.pipeline.PipelineContext
 import io.ktor.util.pipeline.execute
+import io.ktor.utils.io.KtorDsl
 import kotlinx.coroutines.launch
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext

diff --git a/core/common/src/dev/programadorthi/routing/core/RoutingBuilder.kt b/core/common/src/dev/programadorthi/routing/core/RoutingBuilder.kt
@@ -5,8 +5,8 @@
 package dev.programadorthi.routing.core
 
 import dev.programadorthi.routing.core.application.ApplicationCall
-import io.ktor.util.KtorDsl
 import io.ktor.util.pipeline.PipelineInterceptor
+import io.ktor.utils.io.KtorDsl
 
 /**
  * Builds a route to match the specified [path].

diff --git a/core/common/src/dev/programadorthi/routing/core/application/Application.kt b/core/common/src/dev/programadorthi/routing/core/application/Application.kt
@@ -4,8 +4,8 @@
 
 package dev.programadorthi.routing.core.application
 
-import io.ktor.util.KtorDsl
 import io.ktor.util.logging.Logger
+import io.ktor.utils.io.KtorDsl
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob

diff --git a/core/common/src/dev/programadorthi/routing/core/application/Hook.kt b/core/common/src/dev/programadorthi/routing/core/application/Hook.kt
@@ -1,6 +1,6 @@
 package dev.programadorthi.routing.core.application
 
-import io.ktor.util.KtorDsl
+import io.ktor.utils.io.KtorDsl
 
 /**
  * A hook that can be registered in [PluginBuilder].

diff --git a/core/common/src/dev/programadorthi/routing/core/application/KtorCallContexts.kt b/core/common/src/dev/programadorthi/routing/core/application/KtorCallContexts.kt
@@ -3,8 +3,8 @@
  */
 package dev.programadorthi.routing.core.application
 
-import io.ktor.util.KtorDsl
 import io.ktor.util.pipeline.PipelineContext
+import io.ktor.utils.io.KtorDsl
 
 /**
  * The context associated with the call that is currently being processed by server.

diff --git a/core/common/src/dev/programadorthi/routing/core/application/PluginBuilder.kt b/core/common/src/dev/programadorthi/routing/core/application/PluginBuilder.kt
@@ -8,10 +8,10 @@ import dev.programadorthi.routing.core.application.debug.PHASE_ON_CALL
 import dev.programadorthi.routing.core.application.debug.ijDebugReportHandlerFinished
 import dev.programadorthi.routing.core.application.debug.ijDebugReportHandlerStarted
 import io.ktor.util.AttributeKey
-import io.ktor.util.KtorDsl
 import io.ktor.util.debug.addToContextInDebugMode
 import io.ktor.util.pipeline.PipelineContext
 import io.ktor.util.pipeline.PipelinePhase
+import io.ktor.utils.io.KtorDsl
 import kotlin.random.Random
 
 /**

diff --git a/...ces/common/src/dev/programadorthi/routing/events/resources/EventResourcesConfiguration.kt b/...ces/common/src/dev/programadorthi/routing/events/resources/EventResourcesConfiguration.kt
@@ -1,7 +1,7 @@
 package dev.programadorthi.routing.events.resources
 
 import dev.programadorthi.routing.events.resources.serialization.EventResourcesFormat
-import io.ktor.util.KtorDsl
+import io.ktor.utils.io.KtorDsl
 import kotlinx.serialization.modules.EmptySerializersModule
 import kotlinx.serialization.modules.SerializersModule
 

diff --git a/events/common/src/dev/programadorthi/routing/events/EventRoutingBuilder.kt b/events/common/src/dev/programadorthi/routing/events/EventRoutingBuilder.kt
@@ -4,8 +4,8 @@ import dev.programadorthi.routing.core.Route
 import dev.programadorthi.routing.core.Routing
 import dev.programadorthi.routing.core.application.ApplicationCall
 import dev.programadorthi.routing.core.route
-import io.ktor.util.KtorDsl
 import io.ktor.util.pipeline.PipelineInterceptor
+import io.ktor.utils.io.KtorDsl
 
 @KtorDsl
 public fun Route.event(

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ compose = "1.5.11"
 
 coroutines = "1.8.0-RC2"
 kotlin = "1.9.21"
-ktor = "2.2.4"
+ktor = "3.0.0-beta-1"
 serialization = "1.6.2"
 slf4j = "2.0.4"
 voyager = "1.0.0"

diff --git a/javascript/js/src/dev/programadorthi/routing/javascript/JavascriptRoutingBuilder.kt b/javascript/js/src/dev/programadorthi/routing/javascript/JavascriptRoutingBuilder.kt
@@ -5,8 +5,8 @@ import dev.programadorthi.routing.core.RouteMethod
 import dev.programadorthi.routing.core.application.ApplicationCall
 import dev.programadorthi.routing.core.application.call
 import dev.programadorthi.routing.core.route
-import io.ktor.util.KtorDsl
 import io.ktor.util.pipeline.PipelineContext
+import io.ktor.utils.io.KtorDsl
 import kotlinx.browser.window
 import org.w3c.dom.Element
 import toData

diff --git a/samples/kotlin-js-sample/src/jsMain/kotlin/Routing.kt b/samples/kotlin-js-sample/src/jsMain/kotlin/Routing.kt
@@ -7,7 +7,7 @@ import dev.programadorthi.routing.core.replace
 import dev.programadorthi.routing.core.replaceAll
 import dev.programadorthi.routing.core.route
 import dev.programadorthi.routing.core.stackNeglect
-import io.ktor.util.KtorDsl
+import io.ktor.utils.io.KtorDsl
 import io.ktor.util.pipeline.PipelineInterceptor
 import kotlinx.browser.window
 import kotlinx.coroutines.channels.Channel

diff --git a/sessions/common/src/dev/programadorthi/routing/sessions/SessionsConfig.kt b/sessions/common/src/dev/programadorthi/routing/sessions/SessionsConfig.kt
@@ -4,7 +4,7 @@
 
 package dev.programadorthi.routing.sessions
 
-import io.ktor.util.KtorDsl
+import io.ktor.utils.io.KtorDsl
 
 /**
  * A configuration for the [Sessions] plugin.

diff --git a/status-pages/common/src/dev/programadorthi/routing/statuspages/StatusPages.kt b/status-pages/common/src/dev/programadorthi/routing/statuspages/StatusPages.kt
@@ -10,9 +10,9 @@ import dev.programadorthi.routing.core.application.createApplicationPlugin
 import dev.programadorthi.routing.core.application.hooks.CallFailed
 import dev.programadorthi.routing.core.logging.mdcProvider
 import io.ktor.util.AttributeKey
-import io.ktor.util.KtorDsl
 import io.ktor.util.logging.KtorSimpleLogger
 import io.ktor.util.reflect.instanceOf
+import io.ktor.utils.io.KtorDsl
 import kotlin.reflect.KClass
 
 private val LOGGER = KtorSimpleLogger("kotlin-routing-status-pages")

diff --git a/voyager/common/src/dev/programadorthi/routing/voyager/VoyagerRoutingBuilder.kt b/voyager/common/src/dev/programadorthi/routing/voyager/VoyagerRoutingBuilder.kt
@@ -6,8 +6,8 @@ import dev.programadorthi.routing.core.RouteMethod
 import dev.programadorthi.routing.core.application.ApplicationCall
 import dev.programadorthi.routing.core.application.call
 import dev.programadorthi.routing.core.route
-import io.ktor.util.KtorDsl
 import io.ktor.util.pipeline.PipelineContext
+import io.ktor.utils.io.KtorDsl
 
 @KtorDsl
 public fun Route.screen(