Migrate testtool to ktor 3.0.0

Author: whyoleg

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ kotlinx-kover = "0.8.3"
 kotlinx-io = "0.5.4"
 kotlinx-serialization = "1.7.3"
 kotlinx-coroutines = "1.9.0"
-ktor = "2.3.12"
+ktor = "3.0.0"
 
 # android
 android = "8.5.0"
@@ -21,7 +21,7 @@ maven-publish = "0.29.0"
 
 # other
 bouncycastle = "1.78.1"
-logback = "1.2.11"
+logback = "1.5.9"
 
 [libraries]
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }

testtool/client/build.gradle.kts

@@ -21,7 +21,6 @@ kotlin {
         browser()
     }
     wasmJs {
-        // No support from KTOR
         nodejs()
         browser()
     }
@@ -33,6 +32,7 @@ kotlin {
     watchosX64()
     watchosArm32()
     watchosArm64()
+    watchosDeviceArm64()
     watchosSimulatorArm64()
 
     tvosX64()
@@ -46,20 +46,16 @@ kotlin {
     linuxArm64()
     mingwX64()
 
-    // No support from KTOR
-    watchosDeviceArm64()
+    // No support from KTOR (TBD: problem with publication)
     androidNativeX64()
     androidNativeX86()
     androidNativeArm64()
     androidNativeArm32()
 
     val supportsKtor: (KotlinCompilation<*>).() -> Boolean = {
-        val konanTarget = (target as? KotlinNativeTarget)?.konanTarget
         when {
-            konanTarget == KonanTarget.WATCHOS_DEVICE_ARM64 -> false
-            konanTarget?.family == Family.ANDROID           -> false
-            platformType == KotlinPlatformType.wasm         -> false
-            else                                            -> true
+            (target as? KotlinNativeTarget)?.konanTarget?.family == Family.ANDROID -> false
+            else                                                                   -> true
         }
     }
 
@@ -71,21 +67,20 @@ kotlin {
             }
             group("ktor") {
                 withCompilations(supportsKtor)
-            }
-            group("nonKtor") {
-                withCompilations { !supportsKtor(it) }
-            }
-            group("cio") {
-                withCompilations {
-                    val target = (it.target as? KotlinNativeTarget)?.konanTarget
-                    when {
-                        target == KonanTarget.WATCHOS_DEVICE_ARM64 -> false
-                        target?.family?.isAppleFamily == true      -> true
-                        target?.family == Family.LINUX             -> true
-                        else                                       -> false
+
+                group("cio") {
+                    withCompilations {
+                        it.supportsKtor() && it.platformType in setOf(
+                            KotlinPlatformType.jvm,
+                            KotlinPlatformType.androidJvm,
+                            KotlinPlatformType.native,
+                        )
                     }
                 }
             }
+            group("nonKtor") {
+                withCompilations { !it.supportsKtor() }
+            }
         }
     }
 
@@ -100,20 +95,10 @@ kotlin {
                 implementation(libs.ktor.client.core)
             }
         }
-        val jvmMain by getting {
-            dependencies {
-                implementation(libs.ktor.client.okhttp)
-            }
-        }
         val cioMain by getting {
             dependencies {
                 implementation(libs.ktor.client.cio)
             }
         }
-        val mingwMain by getting {
-            dependencies {
-                implementation(libs.ktor.client.winhttp)
-            }
-        }
     }
 }

testtool/server/src/main/kotlin/TesttoolServer.kt

@@ -7,7 +7,7 @@ package dev.whyoleg.cryptography.testtool.server
 import io.ktor.server.application.*
 import io.ktor.server.engine.*
 import io.ktor.server.netty.*
-import io.ktor.server.plugins.callloging.*
+import io.ktor.server.plugins.calllogging.*
 import io.ktor.server.plugins.cors.routing.*
 import io.ktor.server.routing.*
 import java.io.*