From 67ba8078c263d50ad4585d64c1687cf5d96bd589 Mon Sep 17 00:00:00 2001 From: zaleslaw Date: Thu, 9 Nov 2023 14:36:35 +0100 Subject: [PATCH] Update Ktor dependency and adjust related imports --- plugins/dataframe-gradle-plugin/build.gradle.kts | 2 +- .../org/jetbrains/dataframe/gradle/EmbeddedServerRunners.kt | 6 +++--- plugins/symbol-processor/build.gradle | 2 +- .../org/jetbrains/dataframe/ksp/EmbeddedServerRunners.kt | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/dataframe-gradle-plugin/build.gradle.kts b/plugins/dataframe-gradle-plugin/build.gradle.kts index 30bc3d1d30..784eac6825 100644 --- a/plugins/dataframe-gradle-plugin/build.gradle.kts +++ b/plugins/dataframe-gradle-plugin/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { testImplementation("io.kotest:kotest-assertions-core:4.6.0") testImplementation("com.android.tools.build:gradle-api:7.3.1") testImplementation("com.android.tools.build:gradle:7.3.1") - testImplementation("io.ktor:ktor-server-netty:1.6.7") + testImplementation("io.ktor:ktor-server-netty:2.3.6") testImplementation(libs.h2db) testImplementation(gradleApi()) } diff --git a/plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/EmbeddedServerRunners.kt b/plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/EmbeddedServerRunners.kt index 843e2061a9..0c0e7e43b6 100644 --- a/plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/EmbeddedServerRunners.kt +++ b/plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/EmbeddedServerRunners.kt @@ -1,11 +1,11 @@ package org.jetbrains.dataframe.gradle -import io.ktor.application.* import io.ktor.http.* -import io.ktor.response.* -import io.ktor.routing.* +import io.ktor.server.application.* import io.ktor.server.engine.* import io.ktor.server.netty.* +import io.ktor.server.response.* +import io.ktor.server.routing.* fun useHostedJson(json: String, f: (url: String) -> Unit) { // duplicated in ksp/EmbeddedServerRunners.kt diff --git a/plugins/symbol-processor/build.gradle b/plugins/symbol-processor/build.gradle index 594292bb6d..91224f3ca4 100644 --- a/plugins/symbol-processor/build.gradle +++ b/plugins/symbol-processor/build.gradle @@ -25,7 +25,7 @@ dependencies { testImplementation("org.jetbrains.kotlin:kotlin-test") testImplementation("com.github.tschuchortdev:kotlin-compile-testing:1.5.0") testImplementation("com.github.tschuchortdev:kotlin-compile-testing-ksp:1.5.0") - testImplementation("io.ktor:ktor-server-netty:1.6.7") + testImplementation("io.ktor:ktor-server-netty:2.3.6") testImplementation("io.kotest:kotest-assertions-core:4.6.0") } diff --git a/plugins/symbol-processor/src/test/kotlin/org/jetbrains/dataframe/ksp/EmbeddedServerRunners.kt b/plugins/symbol-processor/src/test/kotlin/org/jetbrains/dataframe/ksp/EmbeddedServerRunners.kt index 669977ce4b..045e664ab4 100644 --- a/plugins/symbol-processor/src/test/kotlin/org/jetbrains/dataframe/ksp/EmbeddedServerRunners.kt +++ b/plugins/symbol-processor/src/test/kotlin/org/jetbrains/dataframe/ksp/EmbeddedServerRunners.kt @@ -1,10 +1,10 @@ package org.jetbrains.dataframe.ksp -import io.ktor.application.* -import io.ktor.response.* -import io.ktor.routing.* +import io.ktor.server.application.* import io.ktor.server.engine.* import io.ktor.server.netty.* +import io.ktor.server.response.* +import io.ktor.server.routing.* import java.io.File fun useHostedFile(file: File, f: (url: String) -> Unit) {