From 3cc6bc1426770c0cbabe0dfb1608eb6e7880c5fd Mon Sep 17 00:00:00 2001
From: ftomassetti <federico@strumenta.com>
Date: Sat, 14 Sep 2024 13:22:00 +0200
Subject: [PATCH] Update dependencies and configuration

---
 build.gradle                        | 2 +-
 core/build.gradle                   | 2 +-
 gradle.properties                   | 1 -
 gradle/libs.versions.toml           | 5 ++++-
 lionwebrepo-client/build.gradle.kts | 3 +--
 semantics/build.gradle.kts          | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 11342d48..0b5126d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
 
 plugins {
     id 'org.jetbrains.kotlin.jvm' version "${kotlin_version}"
-    id "org.jlleitschuh.gradle.ktlint" version "11.5.1"
+    alias(libs.plugins.ktlint)
     id("maven-publish")
     id("idea")
     id("signing")
diff --git a/core/build.gradle b/core/build.gradle
index 532d66de..5e7d472d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm'
-    id "org.jlleitschuh.gradle.ktlint"
+    alias(libs.plugins.ktlint)
     id "maven-publish"
     id "antlr"
     id "idea"
diff --git a/gradle.properties b/gradle.properties
index 67310417..aa195108 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,6 @@ gson_version=2.10.1
 lionwebJavaVersion=0.2.18
 kspVersion=1.0.11
 lionwebGenGradlePluginID=com.strumenta.kolasu.lionwebgen
-kotestVersion=1.3.3
 lionwebRepositoryCommitID=ce4949ab88e2407d75b531a1807fbd690e6dab1f
 SONATYPE_CONNECT_TIMEOUT_SECONDS=180
 SONATYPE_CLOSE_TIMEOUT_SECONDS=900
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 56fdab69..750bb79b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,12 @@
 [plugins]
 buildConfig = { id = "com.github.gmazzo.buildconfig", version = "5.3.5" }
 superPublish = { id = "com.vanniktech.maven.publish", version = "0.22.0" }
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.5.1" }
 
 [versions]
 lwjava = "0.2.19"
-lwkotlin = "0.2.6-SNAPSHOT"
+lwkotlin = "0.2.6"
+kotestVersion= "1.3.3"
 
 [libraries]
 lionwebjava = { group = "io.lionweb.lionweb-java", name = "lionweb-java-2023.1-core", version.ref = "lwjava" }
@@ -12,3 +14,4 @@ lionwebjavaemf = { group = "io.lionweb.lionweb-java", name = "lionweb-java-2023.
 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" }
+kotesttestcontainers = { module = "io.kotest.extensions:kotest-extensions-testcontainers", version.ref = "kotestVersion" }
diff --git a/lionwebrepo-client/build.gradle.kts b/lionwebrepo-client/build.gradle.kts
index f8342d04..d652524f 100644
--- a/lionwebrepo-client/build.gradle.kts
+++ b/lionwebrepo-client/build.gradle.kts
@@ -9,7 +9,6 @@ plugins {
     alias(libs.plugins.buildConfig)
 }
 
-val kotestVersion = extra["kotestVersion"]
 val kotlinVersion = extra["kotlin_version"]
 
 repositories {
@@ -32,7 +31,7 @@ testing {
                 implementation(libs.lionwebkotlinrepoclient)
                 implementation("org.jetbrains.kotlin:kotlin-test-junit5:$kotlinVersion")
                 implementation("io.kotest:kotest-runner-junit5-jvm:5.8.0")
-                implementation("io.kotest.extensions:kotest-extensions-testcontainers:$kotestVersion")
+                implementation(libs.kotesttestcontainers)
                 implementation("io.kotest:kotest-assertions-core:5.8.0")
                 implementation("io.kotest:kotest-property:5.8.0")
                 implementation("org.testcontainers:testcontainers:1.19.5")
diff --git a/semantics/build.gradle.kts b/semantics/build.gradle.kts
index 481c57c9..a3c703a2 100644
--- a/semantics/build.gradle.kts
+++ b/semantics/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     `maven-publish`
     idea
     signing
-    id("org.jlleitschuh.gradle.ktlint")
+    alias(libs.plugins.ktlint)
     id("org.jetbrains.dokka")
 }