KTOR-7995 Move test-server to a separate included build

buildSrc/build.gradle.kts

@@ -4,9 +4,6 @@
 
 plugins {
     `kotlin-dsl`
-    // Serialization version should be aligned with the Kotlin version embedded in Gradle
-    // https://docs.gradle.org/current/userguide/compatibility.html#kotlin
-    kotlin("plugin.serialization") version embeddedKotlinVersion
 }
 
 dependencies {
@@ -16,25 +13,6 @@ dependencies {
     implementation(libs.kotlinter)
     implementation(libs.develocity)
     implementation(libs.gradleDoctor)
-
-    implementation(libs.ktor.server.default.headers)
-    implementation(libs.ktor.server.netty)
-    implementation(libs.ktor.server.cio)
-    implementation(libs.ktor.server.jetty)
-    implementation(libs.ktor.server.websockets)
-    implementation(libs.ktor.server.auth)
-    implementation(libs.ktor.server.caching.headers)
-    implementation(libs.ktor.server.conditional.headers)
-    implementation(libs.ktor.server.compression)
-    implementation(libs.ktor.server.content.negotiation)
-    implementation(libs.ktor.server.status.pages)
-    implementation(libs.ktor.serialization.kotlinx)
-    implementation(libs.ktor.network.tls.certificates)
-    implementation(libs.ktor.utils)
-
-    implementation(libs.kotlinx.serialization.json)
-    implementation(libs.logback.classic)
-    implementation(libs.tomlj)
     implementation(libs.kotlinx.atomicfu.gradlePlugin)
 
     // A hack to make version catalogs accessible from buildSrc sources

buildSrc/settings.gradle.kts

@@ -7,22 +7,13 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention")
     id("conventions-dependency-resolution-management")
 }
 
 dependencyResolutionManagement {
-    // Additional repositories for buildSrc dependencies
     @Suppress("UnstableApiUsage")
     repositories {
         gradlePluginPortal()
-
-        exclusiveContent {
-            forRepository {
-                maven("https://maven.pkg.jetbrains.space/public/p/ktor/eap") { name = "KtorEAP" }
-            }
-            filter { includeGroup("io.ktor") }
-        }
     }
 }
 

gradle-settings-conventions/src/main/kotlin/conventions-dependency-resolution-management.settings.gradle.kts

@@ -43,6 +43,13 @@ pluginManagement {
             }
 
             mavenLocal()
+
+            exclusiveContent {
+                forRepository {
+                    maven("https://maven.pkg.jetbrains.space/public/p/ktor/eap") { name = "KtorEAP" }
+                }
+                filter { includeVersionByRegex("io.ktor", ".+", ".+-eap-\\d+") }
+            }
         }
     }
 

ktor-client/ktor-client-android/build.gradle.kts

@@ -4,7 +4,9 @@
 
 import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest
 
-apply<test.server.TestServerPlugin>()
+plugins {
+    id("test-server")
+}
 
 kotlin.sourceSets {
     jvmMain {

ktor-client/ktor-client-apache/build.gradle.kts

@@ -1,6 +1,12 @@
+/*
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
 description = "Apache backend for ktor http client"
 
-apply<test.server.TestServerPlugin>()
+plugins {
+    id("test-server")
+}
 
 kotlin.sourceSets {
     jvmMain {

ktor-client/ktor-client-apache5/build.gradle.kts

@@ -1,6 +1,12 @@
+/*
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
 description = "Apache backend for ktor http client"
 
-apply<test.server.TestServerPlugin>()
+plugins {
+    id("test-server")
+}
 
 kotlin.sourceSets {
     jvmMain {

ktor-client/ktor-client-cio/build.gradle.kts

@@ -4,7 +4,9 @@
 
 description = "CIO backend for ktor http client"
 
-apply<test.server.TestServerPlugin>()
+plugins {
+    id("test-server")
+}
 
 kotlin {
     sourceSets {

ktor-client/ktor-client-curl/build.gradle.kts

@@ -1,4 +1,6 @@
-apply<test.server.TestServerPlugin>()
+/*
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
 
 val paths = listOf(
     "/opt/homebrew/opt/curl/include/",
@@ -19,6 +21,7 @@ val paths = listOf(
 
 plugins {
     id("kotlinx-serialization")
+    id("test-server")
 }
 
 kotlin {

ktor-client/ktor-client-darwin-legacy/build.gradle.kts

@@ -1,4 +1,10 @@
-apply<test.server.TestServerPlugin>()
+/*
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("test-server")
+}
 
 kotlin {
     sourceSets {

ktor-client/ktor-client-darwin/build.gradle.kts

@@ -1,4 +1,10 @@
-apply<test.server.TestServerPlugin>()
+/*
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("test-server")
+}
 
 kotlin {
 

ktor-client/ktor-client-java/build.gradle.kts

@@ -1,4 +1,10 @@
-apply<test.server.TestServerPlugin>()
+/*
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("test-server")
+}
 
 kotlin.sourceSets {
     jvmMain {

ktor-client/ktor-client-okhttp/build.gradle.kts

@@ -1,4 +1,10 @@
-apply<test.server.TestServerPlugin>()
+/*
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("test-server")
+}
 
 kotlin.sourceSets {
     jvmMain {

ktor-client/ktor-client-plugins/ktor-client-auth/build.gradle.kts

@@ -2,8 +2,8 @@
  * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-import test.server.*
-
 description = "Ktor client Auth support"
 
-apply<TestServerPlugin>()
+plugins {
+    id("test-server")
+}

ktor-client/ktor-client-plugins/ktor-client-encoding/build.gradle.kts

@@ -2,7 +2,9 @@
  * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-apply<test.server.TestServerPlugin>()
+plugins {
+    id("test-server")
+}
 
 kotlin.sourceSets {
     jvmTest {

ktor-client/ktor-client-plugins/ktor-client-json/build.gradle.kts

@@ -6,10 +6,9 @@ description = "Ktor client JSON support"
 
 plugins {
     id("kotlinx-serialization")
+    id("test-server")
 }
 
-apply<test.server.TestServerPlugin>()
-
 kotlin {
     sourceSets {
         // This is a workaround for https://youtrack.jetbrains.com/issue/KT-39037

ktor-client/ktor-client-tests/build.gradle.kts

@@ -2,16 +2,13 @@
  * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-import test.server.TestServerPlugin
-
 description = "Common tests for client"
 
 plugins {
     id("kotlinx-serialization")
+    id("test-server")
 }
 
-apply<TestServerPlugin>()
-
 kotlin.sourceSets {
     commonMain {
         dependencies {

ktor-client/ktor-client-winhttp/build.gradle.kts

@@ -1,8 +1,10 @@
-
-apply<test.server.TestServerPlugin>()
+/*
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
 
 plugins {
     id("kotlinx-serialization")
+    id("test-server")
 }
 
 kotlin {

ktor-test-server/README.md

@@ -0,0 +1,3 @@
+# ktor-test-server
+
+The server used for integration tests of Ktor itself.

ktor-test-server/build.gradle.kts

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    `kotlin-dsl`
+    // Serialization version should be aligned with the Kotlin version embedded in Gradle
+    // https://docs.gradle.org/current/userguide/compatibility.html#kotlin
+    kotlin("plugin.serialization") version embeddedKotlinVersion
+}
+
+dependencies {
+    implementation(libs.ktor.server.default.headers)
+    implementation(libs.ktor.server.netty)
+    implementation(libs.ktor.server.cio)
+    implementation(libs.ktor.server.jetty)
+    implementation(libs.ktor.server.websockets)
+    implementation(libs.ktor.server.auth)
+    implementation(libs.ktor.server.caching.headers)
+    implementation(libs.ktor.server.conditional.headers)
+    implementation(libs.ktor.server.compression)
+    implementation(libs.ktor.server.content.negotiation)
+    implementation(libs.ktor.server.status.pages)
+    implementation(libs.ktor.serialization.kotlinx)
+    implementation(libs.ktor.network.tls.certificates)
+    implementation(libs.ktor.utils)
+
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.logback.classic)
+    implementation(libs.tomlj)
+}
+
+// Should be synced with gradle/gradle-daemon-jvm.properties
+kotlin {
+    jvmToolchain(21)
+}

ktor-test-server/settings.gradle.kts

@@ -0,0 +1,13 @@
+/*
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+pluginManagement {
+    includeBuild("../gradle-settings-conventions")
+}
+
+plugins {
+    id("conventions-dependency-resolution-management")
+}
+
+rootProject.name = "ktor-test-server"

ktor-test-server/src/main/kotlin/test-server.gradle.kts

@@ -0,0 +1,13 @@
+/*
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+import test.server.TestServerService
+
+val testServerService = TestServerService.registerIfAbsent(project)
+
+tasks.withType<AbstractTestTask>().configureEach {
+    usesService(testServerService)
+    // Trigger server start if it is not started yet
+    doFirst("start test server") { testServerService.get() }
+}

buildSrc/src/main/kotlin/test/server/ClientTestServer.kt → ktor-test-server/src/main/kotlin/test/server/ClientTestServer.kt

@@ -1,13 +1,12 @@
 /*
- * Copyright 2014-2022 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package test.server
 
 import io.ktor.client.tests.utils.tests.*
 import io.ktor.http.*
 import io.ktor.server.application.*
-import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.plugins.defaultheaders.*
 import io.ktor.server.plugins.statuspages.*
 import io.ktor.server.request.*

buildSrc/src/main/kotlin/test/server/ServerUtils.kt → ktor-test-server/src/main/kotlin/test/server/ServerUtils.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package test.server
@@ -8,7 +8,6 @@ import io.ktor.http.*
 import io.ktor.http.content.*
 import io.ktor.util.*
 import io.ktor.utils.io.*
-import io.ktor.utils.io.charsets.*
 import io.ktor.utils.io.core.*
 
 fun makeArray(size: Int): ByteArray = ByteArray(size) { it.toByte() }

buildSrc/src/main/kotlin/test/server/TestServer.kt → ktor-test-server/src/main/kotlin/test/server/TestServer.kt

@@ -8,9 +8,11 @@ import io.ktor.network.tls.certificates.*
 import io.ktor.server.cio.*
 import io.ktor.server.engine.*
 import io.ktor.server.jetty.jakarta.*
-import test.server.tests.*
-import java.io.*
-import java.util.concurrent.*
+import test.server.tests.CloseableGroup
+import test.server.tests.tcpServerHandler
+import java.io.Closeable
+import java.io.File
+import java.util.concurrent.TimeUnit
 
 const val TEST_SERVER: String = "http://127.0.0.1:8080"