move spec serialization to separate module

AndreiKingsley · AndreiKingsley · commit c06a1b264f36 · 2023-02-06T12:49:16.000+04:00
diff --git a/ggdsl-lets-plot/build.gradle.kts b/ggdsl-lets-plot/build.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
     implementation("org.jetbrains.lets-plot:lets-plot-image-export:$lets_plot_image_version")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version")
     api(project(":ggdsl-api"))
+    implementation(project(":ggdsl-util"))
 }
 
 tasks {
diff --git a/ggdsl-lets-plot/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/letsplot/Integration.kt b/ggdsl-lets-plot/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/letsplot/Integration.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlinx.ggdsl.letsplot.multiplot.model.PlotBunch
 import org.jetbrains.kotlinx.ggdsl.letsplot.multiplot.model.PlotGrid
 import org.jetbrains.kotlinx.ggdsl.letsplot.translator.toLetsPlot
 import org.jetbrains.kotlinx.ggdsl.letsplot.translator.wrap
-import org.jetbrains.kotlinx.ggdsl.letsplot.util.serialization.serializeSpec
+import org.jetbrains.kotlinx.ggdsl.util.serialization.serializeSpec
 import org.jetbrains.kotlinx.jupyter.api.HTML
 import org.jetbrains.kotlinx.jupyter.api.MimeTypedResultEx
 import org.jetbrains.kotlinx.jupyter.api.annotations.JupyterLibrary
diff --git a/ggdsl-lets-plot/src/test/kotlin/org/jetbrains/kotlinx/ggdsl/letsplot/serialization/SpecSerializationTest.kt b/ggdsl-lets-plot/src/test/kotlin/org/jetbrains/kotlinx/ggdsl/letsplot/serialization/SpecSerializationTest.kt
@@ -1,19 +1,15 @@
 package org.jetbrains.kotlinx.ggdsl.letsplot.serialization
 
+import org.jetbrains.kotlinx.ggdsl.dsl.*
 import org.jetbrains.kotlinx.ggdsl.dsl.column.columnPointer
-import org.jetbrains.kotlinx.ggdsl.dsl.continuousPos
-import org.jetbrains.kotlinx.ggdsl.dsl.dataOf
-import org.jetbrains.kotlinx.ggdsl.dsl.invoke
-import org.jetbrains.kotlinx.ggdsl.dsl.plot
-import org.jetbrains.kotlinx.ggdsl.dsl.scaled
 import org.jetbrains.kotlinx.ggdsl.ir.Plot
 import org.jetbrains.kotlinx.ggdsl.letsplot.layers.points
 import org.jetbrains.kotlinx.ggdsl.letsplot.translator.toLetsPlot
-import org.jetbrains.kotlinx.ggdsl.letsplot.util.serialization.deserializeSpec
-import org.jetbrains.kotlinx.ggdsl.letsplot.util.serialization.serializeSpec
 import org.jetbrains.kotlinx.ggdsl.letsplot.util.symbol.Symbol
 import org.jetbrains.kotlinx.ggdsl.letsplot.x
 import org.jetbrains.kotlinx.ggdsl.util.color.Color
+import org.jetbrains.kotlinx.ggdsl.util.serialization.deserializeSpec
+import org.jetbrains.kotlinx.ggdsl.util.serialization.serializeSpec
 import org.jetbrains.letsPlot.intern.toSpec
 import kotlin.test.Test
 import kotlin.test.assertEquals
diff --git a/ggdsl-util/build.gradle.kts b/ggdsl-util/build.gradle.kts
@@ -0,0 +1,31 @@
+plugins {
+    kotlin("jvm")
+    kotlin("plugin.serialization")
+}
+
+repositories {
+    mavenCentral()
+}
+
+val serialization_version: String by project
+
+dependencies {
+    implementation(kotlin("stdlib"))
+    testImplementation(kotlin("test"))
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version")
+}
+
+tasks {
+    compileKotlin {
+        kotlinOptions.jvmTarget = "1.8"
+    }
+    compileTestKotlin {
+        kotlinOptions.jvmTarget = "1.8"
+    }
+}
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = JavaVersion.VERSION_1_8.toString()
+    targetCompatibility = JavaVersion.VERSION_1_8.toString()
+}
+
diff --git a/ggdsl-util/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/util/serialization/specSerialization.kt b/ggdsl-util/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/util/serialization/specSerialization.kt
@@ -1,16 +1,6 @@
-package org.jetbrains.kotlinx.ggdsl.letsplot.util.serialization
+package org.jetbrains.kotlinx.ggdsl.util.serialization
 
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonElement
-import kotlinx.serialization.json.JsonNull
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.booleanOrNull
-import kotlinx.serialization.json.buildJsonArray
-import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.doubleOrNull
-import kotlinx.serialization.json.intOrNull
-import kotlinx.serialization.json.longOrNull
+import kotlinx.serialization.json.*
 
 internal typealias Spec = Map<String, Any>
 
diff --git a/ggdsl-util/src/test/kotlin/org/jetbrains/kotlinx/ggdsl/util/serialization/SpecSerializationTest.kt b/ggdsl-util/src/test/kotlin/org/jetbrains/kotlinx/ggdsl/util/serialization/SpecSerializationTest.kt
@@ -0,0 +1,6 @@
+package org.jetbrains.kotlinx.ggdsl.util.serialization
+
+
+internal class SpecSerializationTest {
+    //TODO
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 kotlin.code.style=official
 kotlin.jupyter.add.scanner=true
-version = 0.3.0
+version = 0.3.1
 
 # Koltin
 systemProp.kotlin_version=1.8.0
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -4,6 +4,7 @@ include("ggdsl-lets-plot")
 include("ggdsl-echarts")
 include("ggdsl-dataframe")
 include("ggdsl-dataframe-lets-plot")
+include("ggdsl-util")
 
 include("examples:idea-examples:lets-plot-simple")
 include("examples:idea-examples:lets-plot-dataframe-simple")

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ dependencies {`
`23`	`23`	`implementation("org.jetbrains.lets-plot:lets-plot-image-export:$lets_plot_image_version")`
`24`	`24`	`implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version")`
`25`	`25`	`api(project(":ggdsl-api"))`
	`26`	`+ implementation(project(":ggdsl-util"))`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`tasks {`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +package org.jetbrains.kotlinx.ggdsl.util.serialization
++
++
 +internal class SpecSerializationTest {
 +    //TODO
 +}