Merge branch 'maintenance/kolasu15'

Strumenta · Jan 17, 2025 · 3a105ae · 3a105ae
2 parents ea2e958 + dd326f3
commit 3a105ae
Show file tree

Hide file tree

Showing 10 changed files with 262 additions and 321 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,8 @@ kotlinPluginID=com.strumenta.kolasu.kolasu-multiplatform
 lionwebGenGradlePluginID=com.strumenta.kolasu.lionwebgen
 kspVersion=1.0.25
 KotlinCompilation.useKapt4=true
-antlrKotlinVersion=1.0.1
-lionwebRepositoryCommitID=ce4949ab88e2407d75b531a1807fbd690e6dab1f
+antlrKotlinVersion=1.0.2
+# We should get this from lionweb-kotlin, somehow
+lionwebRepositoryCommitID=cbf8e0c67ecadcc3cdf892497e523304a15ff508
 SONATYPE_CONNECT_TIMEOUT_SECONDS=180
-SONATYPE_CLOSE_TIMEOUT_SECONDS=900
+SONATYPE_CLOSE_TIMEOUT_SECONDS=900
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,25 +1,25 @@
 [versions]
 antlr4 = "4.9.3"
-lwjava = "0.2.19"
-lwkotlin = "0.2.6"
+lwjava = "0.3.0"
+lwkotlin = "0.3.0"
 kotestVersion= "1.3.3"
 
 [plugins]
 buildConfig = { id = "com.github.gmazzo.buildconfig", version = "5.4.0" }
 # More recent versions og this plugin to do not work with JVM 8
 # We should configure JVM 11 for the build and JVM 8 only as a target
 superPublish = { id = "com.vanniktech.maven.publish", version = "0.21.0" }
-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "12.1.1" }
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "12.1.2" }
 gradlePublish = { id = "com.gradle.plugin-publish", version = "1.2.1" }
 kover = { id = "org.jetbrains.kotlinx.kover", version = "0.8.3" }
 
 [libraries]
+lionwebjava = { group = "io.lionweb.lionweb-java", name = "lionweb-java-2024.1-core", version.ref = "lwjava" }
+lionwebjavaemf = { group = "io.lionweb.lionweb-java", name = "lionweb-java-2024.1-emf", version.ref = "lwjava" }
 gson = { module = "com.google.code.gson:gson", version = "2.11.0" }
 antlr4Tool = { module = "org.antlr:antlr4", version.ref = "antlr4" }
 antlr4jRuntime = { module = "org.antlr:antlr4-runtime", version.ref= "antlr4" }
 clikt = { module = "com.github.ajalt.clikt:clikt", version="4.4.0"}
-lionwebjava = { group = "io.lionweb.lionweb-java", name = "lionweb-java-2023.1-core", version.ref = "lwjava" }
-lionwebjavaemf = { group = "io.lionweb.lionweb-java", name = "lionweb-java-2023.1-emf", version.ref = "lwjava" }
 lionwebkotlinrepoclient = { group = "io.lionweb.lionweb-kotlin", name = "lionweb-kotlin-2024.1-repo-client", version.ref = "lwkotlin" }
 lionwebkotlinrepoclienttesting = { group = "io.lionweb.lionweb-kotlin", name = "lionweb-kotlin-2024.1-repo-client-testing", version.ref = "lwkotlin" }
 lionwebkotlincore = { group = "io.lionweb.lionweb-kotlin", name = "lionweb-kotlin-2024.1-core", version.ref = "lwkotlin" }