Merge pull request #390 from Strumenta/feature/configureLWVersion

Revert to use LW 2023.1 format
Strumenta · Feb 6, 2025 · eb4921b · eb4921b
2 parents b1b9012 + c1a7386
commit eb4921b
Show file tree

Hide file tree

Showing 17 changed files with 300 additions and 318 deletions.
diff --git a/core/src/main/kotlin/com/strumenta/kolasu/mapping/Support.kt b/core/src/main/kotlin/com/strumenta/kolasu/mapping/Support.kt
@@ -49,7 +49,14 @@ inline fun <reified T : Node> ASTTransformer.translateList(original: Collection<
  *  ```
  */
 inline fun <reified T : Node> ASTTransformer.translateOptional(original: Any?): T? {
-    return original?.let { transform(it, expectedType = T::class) as T }
+    return original?.let {
+        val transformed = transform(it, expectedType = T::class)
+        if (transformed == null) {
+            return null
+        } else {
+            transformed as T
+        }
+    }
 }
 
 /**

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,8 +4,8 @@ superPublish = { id = "com.vanniktech.maven.publish", version = "0.22.0" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.5.1" }
 
 [versions]
-lwjava = "0.3.0"
-lwkotlin = "0.3.0"
+lwjava = "0.3.1"
+lwkotlin = "0.3.2"
 kotestVersion= "1.3.3"
 
 [libraries]

diff --git a/lionweb-gen-gradle/src/main/kotlin/com/strumenta/kolasu/lionwebgen/LionWebGradlePlugin.kt b/lionweb-gen-gradle/src/main/kotlin/com/strumenta/kolasu/lionwebgen/LionWebGradlePlugin.kt
@@ -3,6 +3,7 @@ package com.strumenta.kolasu.lionwebgen
 import com.google.devtools.ksp.gradle.KspExtension
 import com.strumenta.kolasu.lionweb.ASTGenerator
 import com.strumenta.kolasu.lionweb.KotlinCodeProcessor
+import com.strumenta.kolasu.lionweb.LIONWEB_VERSION_USED_BY_KOLASU
 import com.strumenta.kolasu.lionweb.StarLasuLWLanguage
 import io.lionweb.lioncore.java.language.Language
 import io.lionweb.lioncore.java.serialization.JsonSerialization
@@ -46,7 +47,8 @@ class LionWebGradlePlugin : Plugin<Project> {
                     println("processing languageFile $languageFile")
                     when (languageFile.extension) {
                         "json" -> {
-                            val jsonser = SerializationProvider.getStandardJsonSerialization()
+                            val jsonser = SerializationProvider.getStandardJsonSerialization(
+                                LIONWEB_VERSION_USED_BY_KOLASU)
                             jsonser.instanceResolver.addTree(StarLasuLWLanguage)
                             val language = jsonser.deserializeToNodes(FileInputStream(languageFile)).first() as Language
                             val existingKotlinClasses = KotlinCodeProcessor().classesDeclaredInDir(project.file("src/main/kotlin"))
@@ -164,7 +166,7 @@ class LionWebGradlePlugin : Plugin<Project> {
         addKolasuModule("lionweb-gen")
         project.dependencies.add("ksp", "com.strumenta.kolasu:kolasu-lionweb-ksp:${project.kolasuVersion}")
         project.dependencies.add("api", "com.github.ajalt.clikt:clikt:3.5.0")
-        project.dependencies.add("api", "io.lionweb.lionweb-java:lionweb-java-2023.1-core:${project.lionwebJavaVersion}")
+        project.dependencies.add("api", "io.lionweb.lionweb-java:lionweb-java-2024.1-core:${project.lionwebJavaVersion}")
     }
 
 }