Skip to content
This repository was archived by the owner on Nov 12, 2025. It is now read-only.

Commit f368e35

Browse files
ileasileileasile
committed
Remove KSP plugin and outdated annotations; update Kotlin and dependencies; add ktor dependencies in one bunch
1 parent fdec9c5 commit f368e35

File tree

7 files changed

+42
-36
lines changed

7 files changed

+42
-36
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
[versions]
2-
kotlin = "2.0.20"
3-
ksp = "2.0.20-1.0.24"
2+
kotlin = "2.2.20"
43
ktor = "2.3.13"
54
kotlinx-serialization = "1.6.2"
65
jvm-toolchain = "11"
7-
kotlin-jupyter = "0.12.0-421"
6+
kotlin-jupyter = "0.15.1-659"
87
kotlinpoet = "2.1.0"
98
dataframe = "0.15.0"
109
libsPublisher = "1.9.23-dev-45"
1110

1211
[plugins]
1312
kotlin-jvm ={id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
14-
ksp ={id = "com.google.devtools.ksp", version.ref = "ksp" }
1513
kotlin-jupyter-api ={id = "org.jetbrains.kotlin.jupyter.api", version.ref = "kotlin-jupyter" }
1614
publisher ={id = "org.jetbrains.kotlin.libs.publisher", version.ref = "libsPublisher" }
1715

‎ktor-client-core/build.gradle.kts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
plugins{
2-
alias(libs.plugins.ksp)
32
alias(libs.plugins.kotlin.jvm)
43
alias(libs.plugins.kotlin.jupyter.api)
54
alias(libs.plugins.publisher)
65
}
76

87
kotlinJupyter{
98
addApiDependency()
10-
addScannerDependency()
9+
}
10+
11+
tasks.processJupyterApiResources{
12+
libraryProducers =listOf(
13+
"org.jetbrains.kotlinx.jupyter.ktor.client.core.KtorClientCoreIntegration"
14+
)
1115
}
1216

1317
dependencies{

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
packageorg.jetbrains.kotlinx.jupyter.ktor.client.core
22

3-
importio.ktor.client.plugins.contentnegotiation.*
4-
importio.ktor.serialization.kotlinx.json.*
3+
importio.ktor.client.plugins.contentnegotiation.ContentNegotiation
4+
importio.ktor.serialization.kotlinx.json.json
55
importkotlinx.serialization.json.Json
6-
importorg.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
76
importorg.jetbrains.kotlinx.jupyter.api.declare
87
importorg.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
98

@@ -28,34 +27,35 @@ import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
2827
* }
2928
* ```
3029
*/
31-
@JupyterLibrary
3230
publicclassKtorClientCoreIntegration : JupyterIntegration(){
3331
overridefun Builder.onLoaded(){
3432
val ktorVersion ="2.3.7"
3533

36-
funktorClient(artifactName:String){
37-
dependencies("io.ktor:ktor-client-$artifactName-jvm:$ktorVersion")
34+
funMutableList<String>.ktorClient(artifactName:String){
35+
add("io.ktor:ktor-client-$artifactName-jvm:$ktorVersion")
3836
}
3937

40-
ktorClient("core")
38+
dependencies(*buildList{
39+
ktorClient("core")
4140

42-
// ktor-client-cio is loaded as a transitive dependency of this artifact,
43-
// so that it has priority in engine autoselection (it's currently the most popular engine).
44-
ktorClient("apache")
45-
ktorClient("apache5")
46-
ktorClient("java")
41+
// ktor-client-cio is loaded as a transitive dependency of this artifact,
42+
// so that it has priority in engine autoselection (it's currently the most popular engine).
43+
ktorClient("apache")
44+
ktorClient("apache5")
45+
ktorClient("java")
4746

48-
ktorClient("auth")
49-
ktorClient("serialization")
50-
ktorClient("encoding")
51-
ktorClient("json")
52-
ktorClient("gson")
53-
ktorClient("jackson")
54-
ktorClient("logging")
55-
ktorClient("resources")
56-
ktorClient("websockets")
47+
ktorClient("auth")
48+
ktorClient("serialization")
49+
ktorClient("encoding")
50+
ktorClient("json")
51+
ktorClient("gson")
52+
ktorClient("jackson")
53+
ktorClient("logging")
54+
ktorClient("resources")
55+
ktorClient("websockets")
5756

58-
dependencies("io.ktor:ktor-serialization-kotlinx-xml-jvm:$ktorVersion")
57+
add("io.ktor:ktor-serialization-kotlinx-xml-jvm:$ktorVersion")
58+
}.toTypedArray())
5959

6060
import("org.jetbrains.kotlinx.jupyter.ktor.client.core.*")
6161

‎ktor-client/build.gradle.kts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
plugins{
2-
alias(libs.plugins.ksp)
32
alias(libs.plugins.kotlin.jvm)
43
alias(libs.plugins.kotlin.jupyter.api)
54
alias(libs.plugins.publisher)
65
}
76

87
kotlinJupyter{
98
addApiDependency()
10-
addScannerDependency()
9+
}
10+
11+
tasks.processJupyterApiResources{
12+
libraryProducers =listOf(
13+
"org.jetbrains.kotlinx.jupyter.ktor.client.KtorClientIntegration2"
14+
)
1115
}
1216

1317
dependencies{

‎ktor-client/src/main/kotlin/KtorClientIntegration2.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
packageorg.jetbrains.kotlinx.jupyter.ktor.client
22

33
importio.ktor.client.statement.*
4-
importorg.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
54
importorg.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
65
importorg.jetbrains.kotlinx.jupyter.serialization.DeserializeThis
76
importorg.jetbrains.kotlinx.jupyter.ktor.client.core.NotebookHttpResponse
87

9-
@JupyterLibrary
108
publicobject KtorClientIntegration2 : JupyterIntegration(){
119
overridefun Builder.onLoaded(){
1210
import("org.jetbrains.kotlinx.jupyter.ktor.client.*")

‎serialization/build.gradle.kts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
plugins{
2-
alias(libs.plugins.ksp)
32
alias(libs.plugins.kotlin.jvm)
43
alias(libs.plugins.kotlin.jupyter.api)
54
alias(libs.plugins.publisher)
@@ -16,7 +15,12 @@ dependencies{
1615

1716
kotlinJupyter{
1817
addApiDependency()
19-
addScannerDependency()
18+
}
19+
20+
tasks.processJupyterApiResources{
21+
libraryProducers =listOf(
22+
"org.jetbrains.kotlinx.jupyter.serialization.SerializationIntegration"
23+
)
2024
}
2125

2226
tasks.test{

‎serialization/src/main/kotlin/SerializationIntegration.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import kotlinx.serialization.ExperimentalSerializationApi
44
importkotlinx.serialization.SerializationException
55
importkotlinx.serialization.json.*
66
importorg.jetbrains.kotlinx.jupyter.api.*
7-
importorg.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
87
importorg.jetbrains.kotlinx.jupyter.api.libraries.FieldHandlerFactory
98
importorg.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
109
importorg.jetbrains.kotlinx.jupyter.api.libraries.TypeDetection
@@ -72,7 +71,6 @@ public fun String.deserializeJson(className: String? = null): DeserializeThis{
7271
* println(user.address.number + " " + user.address.street)
7372
* ```
7473
*/
75-
@JupyterLibrary
7674
publicclassSerializationIntegration : JupyterIntegration(){
7775
overridefun Builder.onLoaded(){
7876
onLoaded{

0 commit comments

Comments
(0)