From 553ebabaf0079122a006b2993a3c99ec39d7f4b6 Mon Sep 17 00:00:00 2001 From: Alexander Sysoev Date: Tue, 1 Oct 2024 19:50:15 +0200 Subject: [PATCH] Update tests --- samples/ktor-android-app/gradle/libs.versions.toml | 2 +- samples/ktor-web-app/gradle/libs.versions.toml | 2 +- .../ktor-web-app/server/src/test/kotlin/ApplicationTest.kt | 4 ++++ samples/simple-ktor-app/build.gradle.kts | 6 +++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/samples/ktor-android-app/gradle/libs.versions.toml b/samples/ktor-android-app/gradle/libs.versions.toml index 8a7e009a..b5caa493 100644 --- a/samples/ktor-android-app/gradle/libs.versions.toml +++ b/samples/ktor-android-app/gradle/libs.versions.toml @@ -11,7 +11,7 @@ compose-plugin = "1.5.14" # https://mvnrepository.com/artifact/androidx.compose. compose-bom = "2024.09.02" material3 = "1.3.0" junit = "4.13.2" -ktor = "2.3.12" +ktor = "3.0.0-rc-1" kotlinx-serialization-json = "1.7.3" kotlinx-coroutines-core = "1.9.0" logback = "1.5.8" diff --git a/samples/ktor-web-app/gradle/libs.versions.toml b/samples/ktor-web-app/gradle/libs.versions.toml index f9a9a7d2..cde10b6b 100644 --- a/samples/ktor-web-app/gradle/libs.versions.toml +++ b/samples/ktor-web-app/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "2.0.10" kotlin-wrappers-bom = "1.0.0-pre.812" -ktor = "2.3.12" +ktor = "3.0.0-rc-1" kotlinx-serialization-json = "1.7.3" kotlinx-coroutines-core = "1.9.0" logback = "1.5.8" diff --git a/samples/ktor-web-app/server/src/test/kotlin/ApplicationTest.kt b/samples/ktor-web-app/server/src/test/kotlin/ApplicationTest.kt index a5241cac..a11982f4 100644 --- a/samples/ktor-web-app/server/src/test/kotlin/ApplicationTest.kt +++ b/samples/ktor-web-app/server/src/test/kotlin/ApplicationTest.kt @@ -16,6 +16,10 @@ import kotlin.test.assertEquals class ApplicationTest { @Test fun testRoot() = testApplication { + application { + module() + } + val service = createClient { installRPC() }.rpc("/api") { diff --git a/samples/simple-ktor-app/build.gradle.kts b/samples/simple-ktor-app/build.gradle.kts index cac2bbca..23e6e80b 100644 --- a/samples/simple-ktor-app/build.gradle.kts +++ b/samples/simple-ktor-app/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin("jvm") version "2.0.10" kotlin("plugin.serialization") version "2.0.10" - id("io.ktor.plugin") version "2.3.12" + id("io.ktor.plugin") version "3.0.0-rc-1" id("org.jetbrains.kotlinx.rpc.plugin") version "0.3.0" } @@ -35,10 +35,10 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client") implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server") - implementation("io.ktor:ktor-client-cio-jvm") + implementation("io.ktor:ktor-client-cio") implementation("io.ktor:ktor-server-netty-jvm") implementation("ch.qos.logback:logback-classic:1.5.8") - testImplementation("io.ktor:ktor-server-tests-jvm") + testImplementation("io.ktor:ktor-server-test-host") testImplementation("org.jetbrains.kotlin:kotlin-test-junit:2.0.10") }