Merge branch 'main' into kpavlov/tests_meta

Author: kpavlov

gradle/libs.versions.toml

@@ -39,28 +39,27 @@ kotlinx-io-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-core", v
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "serialization" }
 
 # Ktor
-ktor-bom = { group = "io.ktor", name = "ktor-bom", version.ref = "ktor" }
-ktor-client-apache5 = { group = "io.ktor", name = "ktor-client-apache5" }
-ktor-client-core = { group = "io.ktor", name = "ktor-client-core" }
-ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging" }
-ktor-server-core = { group = "io.ktor", name = "ktor-server-core" }
-ktor-server-sse = { group = "io.ktor", name = "ktor-server-sse" }
-ktor-server-websockets = { group = "io.ktor", name = "ktor-server-websockets" }
+ktor-client-apache5 = { group = "io.ktor", name = "ktor-client-apache5", version.ref = "ktor" }
+ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
+ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging", version.ref = "ktor" }
+ktor-server-core = { group = "io.ktor", name = "ktor-server-core", version.ref = "ktor" }
+ktor-server-sse = { group = "io.ktor", name = "ktor-server-sse", version.ref = "ktor" }
+ktor-server-websockets = { group = "io.ktor", name = "ktor-server-websockets", version.ref = "ktor" }
 
 # Testing
 awaitility = { group = "org.awaitility", name = "awaitility-kotlin", version.ref = "awaitility" }
 kotest-assertions-core = { group = "io.kotest", name = "kotest-assertions-core", version.ref = "kotest" }
 kotest-assertions-json = { group = "io.kotest", name = "kotest-assertions-json", version.ref = "kotest" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
-ktor-client-mock = { group = "io.ktor", name = "ktor-client-mock" }
-ktor-server-test-host = { group = "io.ktor", name = "ktor-server-test-host" }
+ktor-client-mock = { group = "io.ktor", name = "ktor-client-mock", version.ref = "ktor" }
+ktor-server-test-host = { group = "io.ktor", name = "ktor-server-test-host", version.ref = "ktor" }
 mokksy = { group = "dev.mokksy", name = "mokksy", version.ref = "mokksy" }
 netty-bom = { group = "io.netty", name = "netty-bom", version.ref = "netty" }
 slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
 
 # Samples
-ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio" }
-ktor-server-cio = { group = "io.ktor", name = "ktor-server-cio" }
+ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
+ktor-server-cio = { group = "io.ktor", name = "ktor-server-cio", version.ref = "ktor" }
 
 [plugins]
 kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binaryCompatibilityValidatorPlugin" }

kotlin-sdk-client/build.gradle.kts

@@ -32,7 +32,6 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation(dependencies.platform(libs.ktor.bom))
                 api(project(":kotlin-sdk-core"))
                 api(libs.ktor.client.core)
                 implementation(libs.kotlin.logging)

kotlin-sdk-core/build.gradle.kts

@@ -110,7 +110,6 @@ kotlin {
         commonMain {
             kotlin.srcDir(generateLibVersion)
             dependencies {
-                implementation(dependencies.platform(libs.ktor.bom))
                 api(libs.kotlinx.serialization.json)
                 api(libs.kotlinx.coroutines.core)
                 api(libs.kotlinx.io.core)

kotlin-sdk-server/build.gradle.kts

@@ -9,7 +9,6 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation(dependencies.platform(libs.ktor.bom))
                 api(project(":kotlin-sdk-core"))
                 api(libs.ktor.server.core)
                 api(libs.ktor.server.sse)

kotlin-sdk-test/build.gradle.kts

@@ -11,7 +11,6 @@ kotlin {
     sourceSets {
         commonTest {
             dependencies {
-                implementation(dependencies.platform(libs.ktor.bom))
                 implementation(project(":kotlin-sdk"))
                 implementation(kotlin("test"))
                 implementation(libs.kotest.assertions.core)

kotlin-sdk/build.gradle.kts

@@ -7,7 +7,6 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation(dependencies.platform(libs.ktor.bom))
                 api(project(":kotlin-sdk-core"))
                 api(project(":kotlin-sdk-client"))
                 api(project(":kotlin-sdk-server"))