Rename modules, classes, packages and artifacts

ark-1 · ark-1 · commit 31caab34ec51 · 2024-04-05T20:30:46.000+02:00
json-generation -&gt; serialization
ktor-client -&gt; ktor-client-core
ktor-client-json-generation -&gt; ktor-client
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 kotlin.code.style=official
-version=0.1.0
+version=0.2.0
diff --git a/ktor-client-core/build.gradle.kts b/ktor-client-core/build.gradle.kts
@@ -11,8 +11,11 @@ kotlinJupyter{
 }
 
 dependencies{
- api(project(":ktor-client"))
- api(project(":json-generation"))
+ testImplementation(libs.kotlin.test)
+ api(libs.ktor.client.core)
+ runtimeOnly(libs.ktor.client.cio)
+ api(libs.ktor.client.content.negotiation)
+ api(libs.ktor.serialization.kotlinx.json)
 }
 
 tasks.test{
@@ -22,4 +25,3 @@ kotlin{
 jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 explicitApi()
 }
-
diff --git a/ktor-client-core/src/main/kotlin/KtorClientCoreIntegration.kt b/ktor-client-core/src/main/kotlin/KtorClientCoreIntegration.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlinx.jupyter.ktor.client
+package org.jetbrains.kotlinx.jupyter.ktor.client.core
 
 import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.serialization.kotlinx.json.*
@@ -29,7 +29,7 @@ import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
 * ```
 */
 @JupyterLibrary
-public class KtorClientIntegration : JupyterIntegration(){
+public class KtorClientCoreIntegration : JupyterIntegration(){
 override fun Builder.onLoaded(){
 val ktorVersion = "2.3.7"
 
@@ -57,7 +57,7 @@ public class KtorClientIntegration : JupyterIntegration(){
 
 dependencies("io.ktor:ktor-serialization-kotlinx-xml-jvm:$ktorVersion")
 
- import("org.jetbrains.kotlinx.jupyter.ktor.client.*")
+ import("org.jetbrains.kotlinx.jupyter.ktor.client.core.*")
 
 onLoaded{
 val httpClient = NotebookHttpClient{
diff --git a/ktor-client-core/src/main/kotlin/NotebookHttpClient.kt b/ktor-client-core/src/main/kotlin/NotebookHttpClient.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlinx.jupyter.ktor.client
+package org.jetbrains.kotlinx.jupyter.ktor.client.core
 
 import io.ktor.client.*
 import io.ktor.client.engine.*
diff --git a/ktor-client-core/src/main/kotlin/NotebookHttpResponse.kt b/ktor-client-core/src/main/kotlin/NotebookHttpResponse.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlinx.jupyter.ktor.client
+package org.jetbrains.kotlinx.jupyter.ktor.client.core
 
 import io.ktor.client.call.*
 import io.ktor.client.statement.*
diff --git a/ktor-client-core/src/main/kotlin/Requests.kt b/ktor-client-core/src/main/kotlin/Requests.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlinx.jupyter.ktor.client
+package org.jetbrains.kotlinx.jupyter.ktor.client.core
 
 import io.ktor.client.*
 import io.ktor.client.request.*
diff --git a/ktor-client-core/src/test/kotlin/KtorClientCoreIntegrationTest.kt b/ktor-client-core/src/test/kotlin/KtorClientCoreIntegrationTest.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlinx.jupyter.ktor.client
+package org.jetbrains.kotlinx.jupyter.ktor.client.core
 
 import kotlinx.serialization.json.JsonElement
 import org.intellij.lang.annotations.Language
@@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertIs
 
-class KtorClientIntegrationTest : JupyterReplTestCase(
+class KtorClientCoreIntegrationTest : JupyterReplTestCase(
 replProvider = ReplProvider.withDefaultClasspathResolution(),
 ){
 @Test
diff --git a/ktor-client/build.gradle.kts b/ktor-client/build.gradle.kts
@@ -11,11 +11,8 @@ kotlinJupyter{
 }
 
 dependencies{
- testImplementation(libs.kotlin.test)
- api(libs.ktor.client.core)
- runtimeOnly(libs.ktor.client.cio)
- api(libs.ktor.client.content.negotiation)
- api(libs.ktor.serialization.kotlinx.json)
+ api(project(":ktor-client-core"))
+ api(project(":serialization"))
 }
 
 tasks.test{
diff --git a/ktor-client/src/main/kotlin/KtorClientIntegration2.kt b/ktor-client/src/main/kotlin/KtorClientIntegration2.kt
@@ -1,15 +1,15 @@
-package org.jetbrains.kotlinx.jupyter.ktor.client.json
+package org.jetbrains.kotlinx.jupyter.ktor.client
 
+import io.ktor.client.statement.*
 import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
 import org.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
-import org.jetbrains.kotlinx.jupyter.json.DeserializeThis
-import org.jetbrains.kotlinx.jupyter.ktor.client.NotebookHttpResponse
-import io.ktor.client.statement.*
+import org.jetbrains.kotlinx.jupyter.serialization.DeserializeThis
+import org.jetbrains.kotlinx.jupyter.ktor.client.core.NotebookHttpResponse
 
 @JupyterLibrary
-public object KtorClientJsonGeneration : JupyterIntegration(){
+public object KtorClientIntegration2 : JupyterIntegration(){
 override fun Builder.onLoaded(){
- import("org.jetbrains.kotlinx.jupyter.ktor.client.json.*")
+ import("org.jetbrains.kotlinx.jupyter.ktor.client.*")
 }
 }
 
diff --git a/serialization/build.gradle.kts b/serialization/build.gradle.kts
diff --git a/serialization/src/main/kotlin/SerializationIntegration.kt b/serialization/src/main/kotlin/SerializationIntegration.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlinx.jupyter.json
+package org.jetbrains.kotlinx.jupyter.serialization
 
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerializationException
@@ -58,7 +58,7 @@ public fun String.deserializeJson(className: String? = null): DeserializeThis{
 * ```
 */
 @JupyterLibrary
-public class JsonGenerationIntegration : JupyterIntegration(){
+public class SerializationIntegration : JupyterIntegration(){
 override fun Builder.onLoaded(){
 onLoaded{
 val jsonDeserializer = Json{
@@ -70,10 +70,10 @@ public class JsonGenerationIntegration : JupyterIntegration(){
 
 import("kotlinx.serialization.*")
 import("kotlinx.serialization.json.*")
- import("org.jetbrains.kotlinx.jupyter.json.deserializeJson")
+ import("org.jetbrains.kotlinx.jupyter.serialization.deserializeJson")
 
 // required for auto-deserialization below
- import("org.jetbrains.kotlinx.jupyter.json.UntypedAny")
+ import("org.jetbrains.kotlinx.jupyter.serialization.UntypedAny")
 
 addRenderer(
 createRenderer(
diff --git a/serialization/src/main/kotlin/UntypedSerialization.kt b/serialization/src/main/kotlin/UntypedSerialization.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlinx.jupyter.json
+package org.jetbrains.kotlinx.jupyter.serialization
 
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.InternalSerializationApi
diff --git a/serialization/src/test/kotlin/SerializationIntegrationTest.kt b/serialization/src/test/kotlin/SerializationIntegrationTest.kt
@@ -1,6 +1,5 @@
-package org.jetbrains.kotlinx.jupyter.json
+package org.jetbrains.kotlinx.jupyter.serialization
 
-import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.buildJsonObject
@@ -9,11 +8,10 @@ import org.jetbrains.kotlinx.jupyter.api.MimeTypedResultEx
 import org.jetbrains.kotlinx.jupyter.testkit.JupyterReplTestCase
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
-import java.io.File
 import kotlin.test.assertEquals
 import kotlin.test.assertIs
 
-class JsonClassesGenerationTest : JupyterReplTestCase(){
+class JsonSerializationIntegrationTest : JupyterReplTestCase(){
 @Test
 fun person(){
 end2end(
@@ -255,7 +253,7 @@ class JsonClassesGenerationTest : JupyterReplTestCase(){
 }
 
 check("\"\"\"$json\"\"\"")
- check("org.jetbrains.kotlinx.jupyter.json.DeserializeThis(\"\"\"$json\"\"\", \"Class\")")
+ check("org.jetbrains.kotlinx.jupyter.serialization.DeserializeThis(\"\"\"$json\"\"\", \"Class\")")
 }
 
 private fun end2end(
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,6 +2,6 @@ plugins{
 id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
 }
 rootProject.name = "notebooks-ktor-client"
-include("json-generation")
+include("serialization")
+include("ktor-client-core")
 include("ktor-client")
-include("ktor-client-json-generation")

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`kotlin.code.style=official`
`2`		`-version=0.1.0`
	`2`	`+version=0.2.0`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,11 @@ kotlinJupyter{`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`dependencies{`
`14`		`- api(project(":ktor-client"))`
`15`		`- api(project(":json-generation"))`
	`14`	`+ testImplementation(libs.kotlin.test)`
	`15`	`+ api(libs.ktor.client.core)`
	`16`	`+ runtimeOnly(libs.ktor.client.cio)`
	`17`	`+ api(libs.ktor.client.content.negotiation)`
	`18`	`+ api(libs.ktor.serialization.kotlinx.json)`
`16`	`19`	`}`
`17`	`20`
`18`	`21`	`tasks.test{`
`@@ -22,4 +25,3 @@ kotlin{`
`22`	`25`	`jvmToolchain(libs.versions.jvm.toolchain.get().toInt())`
`23`	`26`	`explicitApi()`
`24`	`27`	`}`
`25`		`-`
-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 -packageorg.jetbrains.kotlinx.jupyter.ktor.client
 +packageorg.jetbrains.kotlinx.jupyter.ktor.client.core
 importio.ktor.client.plugins.contentnegotiation.*
 importio.ktor.serialization.kotlinx.json.*
  * ```
 */
 @JupyterLibrary
 -publicclassKtorClientIntegration : JupyterIntegration(){
 +publicclassKtorClientCoreIntegration : JupyterIntegration(){
 overridefun Builder.onLoaded(){
 val ktorVersion ="2.3.7"
  dependencies("io.ktor:ktor-serialization-kotlinx-xml-jvm:$ktorVersion")
 - import("org.jetbrains.kotlinx.jupyter.ktor.client.*")
 + import("org.jetbrains.kotlinx.jupyter.ktor.client.core.*")
  onLoaded{
 val httpClient =NotebookHttpClient{
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-packageorg.jetbrains.kotlinx.jupyter.ktor.client`
	`1`	`+packageorg.jetbrains.kotlinx.jupyter.ktor.client.core`
`2`	`2`
`3`	`3`	`importio.ktor.client.*`
`4`	`4`	`importio.ktor.client.engine.*`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,8 @@ kotlinJupyter{`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`dependencies{`
`14`		`- testImplementation(libs.kotlin.test)`
`15`		`- api(libs.ktor.client.core)`
`16`		`- runtimeOnly(libs.ktor.client.cio)`
`17`		`- api(libs.ktor.client.content.negotiation)`
`18`		`- api(libs.ktor.serialization.kotlinx.json)`
	`14`	`+ api(project(":ktor-client-core"))`
	`15`	`+ api(project(":serialization"))`
`19`	`16`	`}`
`20`	`17`
`21`	`18`	`tasks.test{`
-Original file line number
+Diff line change
@@ @@ -1,15 +1,15 @@ @@
 -packageorg.jetbrains.kotlinx.jupyter.ktor.client.json
 +packageorg.jetbrains.kotlinx.jupyter.ktor.client
 +importio.ktor.client.statement.*
 importorg.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
 importorg.jetbrains.kotlinx.jupyter.api.libraries.JupyterIntegration
 -importorg.jetbrains.kotlinx.jupyter.json.DeserializeThis
 -importorg.jetbrains.kotlinx.jupyter.ktor.client.NotebookHttpResponse
 -importio.ktor.client.statement.*
 +importorg.jetbrains.kotlinx.jupyter.serialization.DeserializeThis
 +importorg.jetbrains.kotlinx.jupyter.ktor.client.core.NotebookHttpResponse
 @JupyterLibrary
 -publicobjectKtorClientJsonGeneration : JupyterIntegration(){
 +publicobjectKtorClientIntegration2 : JupyterIntegration(){
 overridefun Builder.onLoaded(){
 - import("org.jetbrains.kotlinx.jupyter.ktor.client.json.*")
 + import("org.jetbrains.kotlinx.jupyter.ktor.client.*")
+ }
+}