Upgrade Ktor from 3.0.0-beta-1 to 3.0.0-beta-2

Author: SIMULATAN

Diff for: build.gradle.kts

@@ -77,7 +77,7 @@ testing {
                 // for some reason, transitive dependencies aren't included in the test classpath
                 implementation(projects.api)
                 implementation(tests.junit.api)
-                implementation(tests.ktor.server.tests)
+                implementation(tests.ktor.server.testHost)
                 implementation(tests.mockk)
                 implementation(tests.assertj.core)
                 implementation(tests.json)

Diff for: integrations/moodle/src/main/kotlin/me/snoty/integration/moodle/calendar/MoodleCalendars.kt

@@ -21,7 +21,7 @@ class MoodleCalendarBuilder(entityStateService: EntityStateService) : ICalBuilde
 	}
 }
 
-fun Route.iCalRoutes(nodeService: NodeService, calendarService: CalendarService, entityStateService: EntityStateService) {
+fun Routing.iCalRoutes(nodeService: NodeService, calendarService: CalendarService, entityStateService: EntityStateService) {
 	calendarRoutes(
 		nodeService,
 		calendarService,

Diff for: integrations/utils/calendar/src/main/kotlin/me/snoty/integration/utils/calendar/ICalRoutes.kt

@@ -20,7 +20,7 @@ import java.nio.charset.StandardCharsets
 @Serializable
 data class ICalCreateRequest(val nodeId: NodeId)
 
-fun Route.calendarRoutes(
+fun Routing.calendarRoutes(
 	nodeService: NodeService,
 	calendarService: CalendarService,
 	calendarType: String,

Diff for: integrations/webuntis/src/main/kotlin/me/snoty/integration/untis/calendar/WebUntisCalendars.kt

@@ -22,7 +22,7 @@ class WebUntisCalendarBuilder(entityStateService: EntityStateService) : ICalBuil
 	}
 }
 
-fun Route.iCalRoutes(nodeService: NodeService, calendarService: CalendarService, entityStateService: EntityStateService) {
+fun Routing.iCalRoutes(nodeService: NodeService, calendarService: CalendarService, entityStateService: EntityStateService) {
 	calendarRoutes(
 		nodeService,
 		calendarService,

Diff for: settings.gradle.kts

@@ -12,7 +12,7 @@ fun String.kebabCaseToCamelCase(): String {
 
 dependencyResolutionManagement {
 	versionCatalogs {
-		val ktorVersion = "3.0.0-beta-1"
+		val ktorVersion = "3.0.0-beta-2"
 
 		fun buildKtorArtifactAlias(prefix: String? = null, artifact: String, hierarchy: Boolean): String {
 			var result: String = prefix ?: ""
@@ -171,7 +171,7 @@ dependencyResolutionManagement {
 		}
 
 		create("tests") {
-			ktorServerPlugin("tests", prefix = "ktor")
+			ktorServerPlugin("test-host", prefix = "ktor")
 			library("mockk", "io.mockk", "mockk")
 				.version("1.13.10")
 			library("assertj-core", "org.assertj", "assertj-core")

Diff for: src/main/kotlin/me/snoty/backend/Application.kt

@@ -133,6 +133,6 @@ fun main() = runBlocking {
 		register(CodecRegistry::class, codecRegistry)
 	}
 
-	KtorServer(config, featureFlags, buildInfo, meterRegistry, services, nodeJson)
+	KtorServer(config, buildInfo, meterRegistry, services, nodeJson)
 		.start(wait = true)
 }

Diff for: src/main/kotlin/me/snoty/backend/server/KtorServer.kt

@@ -1,7 +1,5 @@
 package me.snoty.backend.server
 
-import ch.qos.logback.classic.Level
-import ch.qos.logback.classic.LoggerContext
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.ktor.server.application.*
 import io.ktor.server.engine.*
@@ -10,14 +8,11 @@ import io.micrometer.core.instrument.MeterRegistry
 import kotlinx.serialization.json.Json
 import me.snoty.backend.build.BuildInfo
 import me.snoty.backend.config.Config
-import me.snoty.backend.featureflags.FeatureFlags
 import me.snoty.backend.injection.ServicesContainer
 import me.snoty.backend.server.plugins.*
-import org.slf4j.LoggerFactory
 
 class KtorServer(
 	private val config: Config,
-	private val featureFlags: FeatureFlags,
 	private val buildInfo: BuildInfo,
 	private val metricsRegistry: MeterRegistry,
 	private val servicesContainer: ServicesContainer,
@@ -38,12 +33,7 @@ class KtorServer(
 			port = config.port.toInt(),
 			host = "0.0.0.0",
 			module = {
-				val loggerFactory = LoggerFactory.getILoggerFactory() as LoggerContext
-				val ktorRootLogger = loggerFactory.exists("io.ktor.server")
-				// workaround for https://youtrack.jetbrains.com/issue/KTOR-7193/Tracing-allow-changing-log-level-at-runtime
-				ktorRootLogger.level = Level.TRACE
 				module()
-				ktorRootLogger.level = Level.convertAnSLF4JLevel(featureFlags.get(featureFlags.logLevel_http_server))
 			},
 			watchPaths = listOf("classes", "resources")
 		).start(wait = wait)

Diff for: src/main/kotlin/me/snoty/backend/server/plugins/Monitoring.kt

@@ -6,7 +6,7 @@ import io.ktor.server.engine.*
 import io.ktor.server.metrics.micrometer.*
 import io.ktor.server.netty.*
 import io.ktor.server.plugins.callid.*
-import io.ktor.server.plugins.callloging.*
+import io.ktor.server.plugins.calllogging.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*

Diff for: src/main/kotlin/me/snoty/backend/server/resources/AboutResource.kt

@@ -15,7 +15,7 @@ data class AboutResponse(
 	val buildInfo: BuildInfo
 )
 
-fun Route.aboutResource(buildInfo: BuildInfo) {
+fun Routing.aboutResource(buildInfo: BuildInfo) {
 	val hostname = InetAddress.getLocalHost().hostName
 	get("/info") {
 		call.respond(AboutResponse(

Diff for: src/main/kotlin/me/snoty/backend/server/resources/wiring/FlowResource.kt

@@ -18,7 +18,7 @@ import me.snoty.integration.common.wiring.node.NodeRegistry
 import me.snoty.integration.common.model.NodePosition
 
 context(ServicesContainer)
-fun Route.flowResource() {
+fun Routing.flowResource() {
 	val nodeRegistry = get<NodeRegistry>()
 	val nodeService = get<NodeService>()
 	val flowService = get<FlowService>()

Diff for: src/main/kotlin/me/snoty/backend/server/resources/wiring/NodeResource.kt

@@ -28,7 +28,7 @@ import me.snoty.integration.common.wiring.node.NodeSettings
 
 context(ServicesContainer)
 @OptIn(InternalSerializationApi::class)
-fun Route.nodeResource(json: Json) {
+fun Routing.nodeResource(json: Json) {
 	val nodeRegistry = get<NodeRegistry>()
 	val nodeService = get<NodeService>()
 	suspend fun deserializeSettings(call: ApplicationCall, descriptor: NodeDescriptor, settingsJson: JsonElement): NodeSettings? {