Added kotlinx.serialization

^KTL-114 Fixed

Author: dkrasnoff

build.gradle.kts

@@ -108,6 +108,7 @@ fun generateProperties(prefix: String = "") = """
     libraries.folder.wasm=${prefix + libWasm}
     libraries.folder.compose-wasm=${prefix + libComposeWasm}
     libraries.folder.compose-wasm-compiler-plugins=${prefix + libComposeWasmCompilerPlugins}
+    libraries.folder.compiler-plugins=${prefix + compilerPluginsForJVM}
     spring.mvc.pathmatch.matching-strategy=ant_path_matcher
     server.compression.enabled=true
     server.compression.mime-types=application/json,text/javascript,application/wasm
@@ -147,6 +148,7 @@ val buildLambda by tasks.creating(Zip::class) {
     from(libWasmFolder) { into(libWasm) }
     from(libComposeWasmFolder) { into(libComposeWasm) }
     from(libJVMFolder) { into(libJVM) }
+    from(compilerPluginsForJVMFolder) {into(compilerPluginsForJVM)}
     from(libComposeWasmCompilerPluginsFolder) { into(libComposeWasmCompilerPlugins) }
     into("lib") {
         from(configurations.compileClasspath) { exclude("tomcat-embed-*") }

buildSrc/src/main/kotlin/properties.kt

@@ -12,6 +12,11 @@ val indexesComposeWasm: String by System.getProperties()
 val Project.kotlinVersion
     get() = the<LibrariesForLibs>().versions.kotlin.get()
 
+
+val Project.libJVM
+    get() = kotlinVersion
+val Project.compilerPluginsForJVM
+    get() = "$kotlinVersion-compiler-plugins"
 val Project.libJS
     get() = "$kotlinVersion-js"
 val Project.libWasm
@@ -20,8 +25,12 @@ val Project.libComposeWasm
     get() = "$kotlinVersion-compose-wasm"
 val Project.libComposeWasmCompilerPlugins
     get() = "$kotlinVersion-compose-wasm-compiler-plugins"
-val Project.libJVM
-    get() = kotlinVersion
+
+val Project.libJVMFolder
+    get() = rootProject.layout.projectDirectory.dir(libJVM)
+
+val Project.compilerPluginsForJVMFolder
+    get() = rootProject.layout.projectDirectory.dir(compilerPluginsForJVM)
 
 val Project.libJSFolder
     get() = rootProject.layout.projectDirectory.dir(libJS)
@@ -33,7 +42,4 @@ val Project.libComposeWasmFolder
     get() = rootProject.layout.projectDirectory.dir(libComposeWasm)
 
 val Project.libComposeWasmCompilerPluginsFolder
-    get() = rootProject.layout.projectDirectory.dir(libComposeWasmCompilerPlugins)
-
-val Project.libJVMFolder
-    get() = rootProject.layout.projectDirectory.dir(libJVM)
+    get() = rootProject.layout.projectDirectory.dir(libComposeWasmCompilerPlugins)

common/src/main/kotlin/component/KotlinEnvironment.kt

@@ -31,7 +31,8 @@ class KotlinEnvironment(
   additionalWasmClasspath: List<File>,
   additionalComposeWasmClasspath: List<File>,
   composeWasmCompilerPlugins: List<File>,
-  composeWasmCompilerPluginsOptions: List<CompilerPluginOption>
+  val compilerPlugins: List<File> = emptyList(),
+  composeWasmCompilerPluginsOptions: List<CompilerPluginOption>,
 ) {
   companion object {
     /**

dependencies/build.gradle.kts

@@ -6,6 +6,12 @@ val kotlinDependency: Configuration by configurations.creating {
     isTransitive = false
 }
 
+val kotlinCompilerPluginDependency: Configuration by configurations.creating {
+    isTransitive = false
+    isCanBeResolved = true
+    isCanBeConsumed = false
+}
+
 val kotlinJsDependency: Configuration by configurations.creating {
     isCanBeResolved = true
     isCanBeConsumed = false
@@ -64,6 +70,12 @@ val copyDependencies by tasks.creating(Copy::class) {
     from(kotlinDependency)
     into(libJVMFolder)
 }
+
+val copyCompilerPluginDependencies by tasks.creating(Copy::class) {
+    from(kotlinCompilerPluginDependency)
+    into(compilerPluginsForJVMFolder)
+}
+
 val copyJSDependencies by tasks.creating(Copy::class) {
     from(kotlinJsDependency)
     into(libJSFolder)
@@ -97,8 +109,11 @@ dependencies {
     kotlinDependency(libs.kotlin.test)
     kotlinDependency(libs.kotlinx.coroutines.core.jvm)
     kotlinDependency(libs.kotlinx.coroutines.test)
-    kotlinDependency(libs.kotlinx.io.core)
     kotlinDependency(libs.kotlinx.datetime)
+    kotlinDependency(libs.kotlinx.io.core)
+    kotlinDependency(libs.kotlinx.serialization.json.jvm)
+    kotlinDependency(libs.kotlinx.serialization.core.jvm)
+    kotlinCompilerPluginDependency(libs.kotlin.serialization.plugin)
     kotlinJsDependency(libs.kotlin.stdlib.js)
     kotlinJsDependency(libs.kotlin.dom.api.compat)
     kotlinWasmDependency(libs.kotlin.stdlib.wasm.js)

gradle/libs.versions.toml

@@ -11,13 +11,14 @@ logstash-logback-encoder = "7.3"
 trove4j = "1.0.20221201"
 kotlinx-coroutines = "1.7.3"
 kotlinx-coroutines-test = "1.6.4"
+kotlinx-datetime = "0.6.0-RC.2"
+kotlinx-io-core = "0.5.1"
+kotlinx-serialization = "1.7.1"
 skiko = "0.7.90"
 # don't forget to update jackson version in `executor.policy` file.
 jackson = "2.14.0"
 hamcrest = "2.2"
 compose = "1.6.0"
-kotlinx-datetime = "0.6.0-RC.2"
-kotlinx-io-core = "0.5.1"
 
 [libraries]
 kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
@@ -40,6 +41,8 @@ kotlinx-coroutines-core-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines-test" }
 kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinx-datetime" }
 kotlinx-io-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-io-core", version.ref = "kotlinx-io-core" }
+kotlinx-serialization-json-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json-jvm", version.ref = "kotlinx-serialization" }
+kotlinx-serialization-core-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core-jvm", version.ref = "kotlinx-serialization" }
 springfox-boot-starter = { group = "io.springfox", name = "springfox-boot-starter", version.ref = "springfox-boot-starter" }
 aws-springboot-container = { group = "com.amazonaws.serverless", name = "aws-serverless-java-container-springboot2", version.ref = "aws-serverless-java-container-springboot2" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
@@ -57,7 +60,7 @@ compose-animation-graphics = { group = "org.jetbrains.compose.animation", name =
 compose-foundation = { group = "org.jetbrains.compose.foundation", name = "foundation", version.ref = "compose" }
 compose-material = { group = "org.jetbrains.compose.material", name = "material", version.ref = "compose" }
 compose-components-resources = { group = "org.jetbrains.compose.components", name = "components-resources", version.ref = "compose" }
-
+kotlin-serialization-plugin = {group= "org.jetbrains.kotlin", name="kotlin-serialization-compiler-plugin", version.ref = "kotlin"}
 
 [bundles]
 kotlin-stdlib = ["kotlin-stdlib", "kotlin-stdlib-jdk7", "kotlin-stdlib-jdk8"]

indexation/build.gradle.kts

@@ -17,6 +17,7 @@ application {
 tasks.withType<JavaExec> {
     dependsOn(":executors:jar")
     dependsOn(":dependencies:copyDependencies")
+    dependsOn(":dependencies:copyCompilerPluginDependencies")
     dependsOn(":dependencies:copyJSDependencies")
     dependsOn(":dependencies:copyWasmDependencies")
     dependsOn(":dependencies:copyComposeWasmCompilerPlugins")
@@ -29,6 +30,7 @@ tasks.withType<JavaExec> {
 
     // Adding classpath directories as task input for up-to-date checks
     inputs.dir(libJVMFolder)
+    inputs.dir(compilerPluginsForJVMFolder)
     inputs.dir(libJSFolder)
     inputs.dir(libWasmFolder)
     inputs.dir(libComposeWasmFolder)

indexation/src/main/kotlin/KotlinEnvironmentConfiguration.kt

@@ -32,6 +32,7 @@ class KotlinEnvironmentConfiguration(
       additionalWasmClasspath,
       additionalComposeWasmClasspath,
       composeWasmCompilerPlugins,
+      emptyList(),
       listOf(
         CompilerPluginOption(
           "androidx.compose.compiler.plugins.kotlin",

src/main/kotlin/com/compiler/server/compiler/components/KotlinCompiler.kt

@@ -97,8 +97,8 @@ class KotlinCompiler(
         "-module-name", "web-module",
         "-no-stdlib", "-no-reflect",
         "-progressive",
-        "-d", outputDir.absolutePathString()
-      )
+        "-d", outputDir.absolutePathString(),
+      ) + kotlinEnvironment.compilerPlugins.map { plugin -> "-Xplugin=${plugin.absolutePath}" }
       K2JVMCompiler().tryCompilation(inputDir, ioFiles, arguments) {
         val outputFiles = buildMap {
           outputDir.visitFileTree {

src/main/kotlin/com/compiler/server/compiler/components/KotlinEnvironment.kt

@@ -9,7 +9,6 @@ import org.springframework.context.annotation.Configuration
 
 @Configuration
 class KotlinEnvironmentConfiguration(
-  val versionInfo: VersionInfo,
   val librariesFile: LibrariesFile
 ) {
   @Bean
@@ -25,13 +24,15 @@ class KotlinEnvironmentConfiguration(
     val additionalWasmClasspath = librariesFile.wasm.listFiles()?.toList() ?: emptyList()
     val additionalComposeWasmClasspath = librariesFile.composeWasm.listFiles()?.toList() ?: emptyList()
     val composeWasmCompilerPlugins = librariesFile.composeWasmComposeCompiler.listFiles()?.toList() ?: emptyList()
+    val compilerPlugins = librariesFile.compilerPlugins.listFiles()?.toList() ?: emptyList()
 
     return KotlinEnvironment(
       classPath,
       additionalJsClasspath,
       additionalWasmClasspath,
       additionalComposeWasmClasspath,
       composeWasmCompilerPlugins,
+      compilerPlugins,
       listOf(
         CompilerPluginOption(
           "androidx.compose.compiler.plugins.kotlin",

src/main/kotlin/com/compiler/server/configuration/ApplicationConfiguration.kt

@@ -33,7 +33,8 @@ class ApplicationConfiguration(
     File(librariesFolderProperties.js),
     File(librariesFolderProperties.wasm),
     File(librariesFolderProperties.composeWasm),
-    File(librariesFolderProperties.composeWasmCompilerPlugins)
+    File(librariesFolderProperties.composeWasmCompilerPlugins),
+    File(librariesFolderProperties.compilerPlugins)
   )
 }
 
@@ -44,4 +45,5 @@ class LibrariesFolderProperties {
   lateinit var wasm: String
   lateinit var composeWasm: String
   lateinit var composeWasmCompilerPlugins: String
+  lateinit var compilerPlugins: String
 }