Update Kotlin and libraries

Author: ileasile

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-kotlin = "1.9.22"
-ksp = "1.9.22-1.0.17"
-ktor = "2.3.7"
+kotlin = "2.0.20"
+ksp = "2.0.20-1.0.24"
+ktor = "2.3.13"
 kotlinx-serialization = "1.6.2"
 jvm-toolchain = "11"
-kotlin-jupyter = "0.12.0-142"
-kotlinpoet = "1.18.1"
-dataframe = "0.13.1"
+kotlin-jupyter = "0.12.0-421"
+kotlinpoet = "2.1.0"
+dataframe = "0.15.0"
 
 [plugins]
 kotlin-jvm ={id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
@@ -19,6 +19,7 @@ kotlin-reflect ={module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
 dataframe ={module = "org.jetbrains.kotlinx:dataframe", version.ref = "dataframe" }
 ktor-client-core ={module = "io.ktor:ktor-client-core-jvm", version.ref = "ktor" }
 ktor-client-cio ={module = "io.ktor:ktor-client-cio-jvm", version.ref = "ktor" }
+ktor-client-mock ={module = "io.ktor:ktor-client-mock-jvm", version.ref = "ktor" }
 ktor-client-content-negotiation ={module = "io.ktor:ktor-client-content-negotiation-jvm", version.ref = "ktor" }
 ktor-serialization-kotlinx-json ={module = "io.ktor:ktor-serialization-kotlinx-json-jvm", version.ref = "ktor" }
 

ktor-client-core/build.gradle.kts

@@ -11,8 +11,6 @@ kotlinJupyter{
 }
 
 dependencies{
- testImplementation(libs.kotlin.test)
- testImplementation(libs.dataframe)
  api(libs.ktor.client.core)
  runtimeOnly(libs.ktor.client.cio)
  compileOnly(libs.dataframe)

ktor-client/build.gradle.kts

@@ -13,6 +13,14 @@ kotlinJupyter{
 dependencies{
  api(project(":ktor-client-core"))
  api(project(":serialization"))
+
+ testImplementation(libs.kotlin.test)
+ testImplementation(libs.kotlinx.serialization.json)
+ testImplementation(libs.ktor.client.mock)
+ testImplementation(libs.dataframe){
+ exclude(group ="org.jetbrains.kotlinx", module ="kotlinx-serialization-core")
+ exclude(group ="org.jetbrains.kotlinx", module ="kotlinx-serialization-json")
+ }
 }
 
 tasks.test{

…/kotlin/KtorClientCoreIntegrationTest.kt …/kotlin/KtorClientCoreIntegrationTest.ktktor-client-core/src/test/kotlin/KtorClientCoreIntegrationTest.kt renamed to ktor-client/src/test/kotlin/KtorClientCoreIntegrationTest.kt ktor-client-core/src/test/kotlin/KtorClientCoreIntegrationTest.kt renamed to ktor-client/src/test/kotlin/KtorClientCoreIntegrationTest.kt

@@ -1,17 +1,17 @@
-packageorg.jetbrains.kotlinx.jupyter.ktor.client.core
+packageorg.jetbrains.kotlinx.jupyter.ktor.client.test
 
 importkotlinx.serialization.json.JsonElement
 importorg.intellij.lang.annotations.Language
 importorg.jetbrains.kotlinx.dataframe.DataFrame
 importorg.jetbrains.kotlinx.jupyter.repl.result.EvalResultEx
 importorg.jetbrains.kotlinx.jupyter.testkit.JupyterReplTestCase
 importorg.jetbrains.kotlinx.jupyter.testkit.ReplProvider
-importorg.junit.jupiter.api.Test
+importkotlin.test.Test
 importkotlin.test.assertEquals
 importkotlin.test.assertIs
 
 classKtorClientCoreIntegrationTest : JupyterReplTestCase(
- replProvider = ReplProvider.withDefaultClasspathResolution(),
+ replProvider = ReplProvider.Companion.withDefaultClasspathResolution(),
 ){
  @Test
 fun`default client engine`(){
@@ -50,9 +50,6 @@ class KtorClientCoreIntegrationTest : JupyterReplTestCase(
 val json ="""{"b":"b","a":{"b":"b","a":null}}"""
  execRaw(
 """
- %use serialization
- @file:DependsOn("io.ktor:ktor-client-mock-jvm:2.3.7")
-
  import io.ktor.client.engine.mock.*
  import io.ktor.client.plugins.contentnegotiation.*
  import io.ktor.http.*
@@ -101,9 +98,6 @@ class KtorClientCoreIntegrationTest : JupyterReplTestCase(
 val json ="""[{"a": 1},{"a": 2},{"a": 3}]"""
  execRaw(
 """
- %use serialization
- @file:DependsOn("io.ktor:ktor-client-mock-jvm:2.3.7")
-
  import io.ktor.client.engine.mock.*
  import io.ktor.client.plugins.contentnegotiation.*
  import io.ktor.http.*
@@ -136,9 +130,6 @@ class KtorClientCoreIntegrationTest : JupyterReplTestCase(
 fun`cannot create dataframe from response that doesn't return json`(){
  execRaw(
 """
- %use serialization
- @file:DependsOn("io.ktor:ktor-client-mock-jvm:2.3.7")
-
  import io.ktor.client.engine.mock.*
  import io.ktor.client.plugins.contentnegotiation.*
  import io.ktor.http.*

settings.gradle.kts

@@ -1,5 +1,5 @@
 plugins{
- id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
+ id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 rootProject.name ="notebooks-ktor-client"
 include("json2kt")