Update Ktor and kotlinx-serialization versions; enhance Ktor version detection logic; make tests rerunnable

Author: ileasile

build.gradle.kts

@@ -16,6 +16,11 @@ allprojects{
  repositories{
  mavenCentral()
  }
+
+ tasks.withType<Test>{
+ useJUnitPlatform()
+ outputs.upToDateWhen{false }
+ }
 }
 
 kotlinPublications{

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 kotlin = "2.2.20"
-ktor = "2.3.13"
-kotlinx-serialization = "1.6.2"
+ktor = "3.3.1"
+kotlinx-serialization = "1.9.0"
 jvm-toolchain = "11"
 kotlin-jupyter = "0.15.1-659"
 kotlinpoet = "2.1.0"

json2kt/build.gradle.kts

@@ -11,9 +11,6 @@ dependencies{
  testImplementation(libs.kotlinx.serialization.json)
 }
 
-tasks.test{
- useJUnitPlatform()
-}
 kotlin{
  jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
  explicitApi()

ktor-client-core/build.gradle.kts

@@ -22,9 +22,6 @@ dependencies{
  api(libs.ktor.serialization.kotlinx.json)
 }
 
-tasks.test{
- useJUnitPlatform()
-}
 kotlin{
  jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
  explicitApi()

ktor-client-core/src/main/kotlin/KtorClientCoreIntegration.kt

@@ -5,6 +5,8 @@ import io.ktor.serialization.kotlinx.json.json
 importkotlinx.serialization.json.Json
 importorg.jetbrains.kotlinx.jupyter.api.declare
 importorg.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
+importjava.util.jar.Attributes
+importjava.util.jar.Manifest
 
 /**
  * Usage:
@@ -29,7 +31,7 @@ import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
 */
 publicclassKtorClientCoreIntegration : JupyterIntegration(){
 overridefun Builder.onLoaded(){
-val ktorVersion ="2.3.7"
+val ktorVersion =findKtorVersion(Thread.currentThread().contextClassLoader)
 
 fun MutableList<String>.ktorClient(artifactName:String){
  add("io.ktor:ktor-client-$artifactName-jvm:$ktorVersion")
@@ -71,3 +73,30 @@ public class KtorClientCoreIntegration : JupyterIntegration(){
  }
  }
 }
+
+privatefunfindKtorVersion(classLoader:ClassLoader) =
+ requireNotNull(findModuleVersion("io.ktor.client.core", classLoader)){
+"Failed to find Ktor version for Ktor integration"
+ }
+
+/**
+ * Attempts to find the implementation version of a given module by inspecting the manifest files
+ * available in the provided class loader's resources.
+*/
+privatefunfindModuleVersion(
+moduleName:String,
+classLoader:ClassLoader,
+): String?{
+val autoModuleKey =Attributes.Name("Automatic-Module-Name")
+val implVersionKey =Attributes.Name.IMPLEMENTATION_VERSION
+
+return classLoader.getResources("META-INF/MANIFEST.MF")
+ .asSequence()
+ .mapNotNull{url ->
+ runCatching{
+ url.openStream().use{Manifest(it) }
+ }.getOrNull()?.mainAttributes
+ }
+ .firstOrNull{it.getValue(autoModuleKey) == moduleName }
+ ?.getValue(implVersionKey)
+}

ktor-client-core/src/main/kotlin/NotebookHttpResponse.kt

@@ -1,12 +1,21 @@
 packageorg.jetbrains.kotlinx.jupyter.ktor.client.core
 
-importio.ktor.client.call.*
-importio.ktor.client.statement.*
-importio.ktor.http.*
-importio.ktor.util.*
-importio.ktor.util.date.*
-importio.ktor.util.reflect.*
-importio.ktor.utils.io.*
+importio.ktor.client.call.DoubleReceiveException
+importio.ktor.client.call.HttpClientCall
+importio.ktor.client.call.NoTransformationFoundException
+importio.ktor.client.call.body
+importio.ktor.client.statement.HttpResponse
+importio.ktor.client.statement.bodyAsText
+importio.ktor.client.statement.content
+importio.ktor.client.statement.readBytes
+importio.ktor.client.statement.readRawBytes
+importio.ktor.http.Headers
+importio.ktor.http.HttpProtocolVersion
+importio.ktor.http.HttpStatusCode
+importio.ktor.util.date.GMTDate
+importio.ktor.util.reflect.TypeInfo
+importio.ktor.utils.io.ByteReadChannel
+importio.ktor.utils.io.InternalAPI
 importkotlinx.coroutines.runBlocking
 importjava.nio.charset.Charset
 importkotlin.coroutines.CoroutineContext
@@ -18,7 +27,7 @@ import kotlin.coroutines.CoroutineContext
 publicclassNotebookHttpResponse(publicvalktorResponse:HttpResponse) : HttpResponse(){
 overrideval call:HttpClientCall get() = ktorResponse.call
  @InternalAPI
-overridevalcontent:ByteReadChannel get() = ktorResponse.content
+overridevalrawContent:ByteReadChannel get() = ktorResponse.rawContent
 overrideval coroutineContext:CoroutineContext get() = ktorResponse.coroutineContext
 overrideval headers:Headers get() = ktorResponse.headers
 overrideval requestTime:GMTDate get() = ktorResponse.requestTime
@@ -58,7 +67,14 @@ public class NotebookHttpResponse(public val ktorResponse: HttpResponse) : HttpR
  * Reads the whole [HttpResponse.content] if `Content-Length` is specified.
  * Otherwise, it just reads one byte.
 */
-publicfunreadBytes(): ByteArray= runBlocking{ktorResponse.readBytes() }
+ @Deprecated("Use readRawBytes() instead", ReplaceWith("readRawBytes()"))
+publicfunreadBytes(): ByteArray= readRawBytes()
+
+/**
+ * Reads the whole [HttpResponse.content] if `Content-Length` is specified.
+ * Otherwise, it just reads one byte.
+*/
+publicfunreadRawBytes(): ByteArray= runBlocking{ktorResponse.readRawBytes() }
 
 /**
  * Reads exactly [count] bytes of the [HttpResponse.content].

ktor-client/build.gradle.kts

@@ -27,9 +27,6 @@ dependencies{
  }
 }
 
-tasks.test{
- useJUnitPlatform()
-}
 kotlin{
  jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
  explicitApi()

serialization/build.gradle.kts

@@ -23,10 +23,6 @@ tasks.processJupyterApiResources{
  )
 }
 
-tasks.test{
- useJUnitPlatform()
-}
-
 kotlin{
  jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
  explicitApi()