From f62eba85abc4343d24c9b5a884abc43949845c7a Mon Sep 17 00:00:00 2001
From: khalilou88 <khalilou88@users.noreply.github.com>
Date: Wed, 12 Jul 2023 12:39:37 +0200
Subject: [PATCH] build: work in progress

---
 .../kotlin-multiplatform/libs.versions.toml       | 15 ++++++++++++++-
 .../gradle/catalog/spring-boot/libs.versions.toml | 11 ++++++++++-
 .../config/kotlin-multiplatform/gradle.properties |  6 +++---
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/packages/nx-gradle/src/generators/init/files/gradle/catalog/kotlin-multiplatform/libs.versions.toml b/packages/nx-gradle/src/generators/init/files/gradle/catalog/kotlin-multiplatform/libs.versions.toml
index 6ed4ba908..af0ecb765 100644
--- a/packages/nx-gradle/src/generators/init/files/gradle/catalog/kotlin-multiplatform/libs.versions.toml
+++ b/packages/nx-gradle/src/generators/init/files/gradle/catalog/kotlin-multiplatform/libs.versions.toml
@@ -1,5 +1,18 @@
 [versions]
+java = "<%= javaVersion %>"
+kotlin = "<%= kotlinVersion %>"
+agp = "<%= agpVersion %>"
+compose = "<%= composeVersion %>"
+ktlint = "<%= ktlintVersion %>"
 
 [libraries]
 
-[plugins]
\ No newline at end of file
+[plugins]
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+android-application = { id = "com.android.application", version.ref = "agp" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose" }
+github-khalilou88-jnxplus = { id = "io.github.khalilou88.jnxplus", version.ref = "<%= jnxplusGradlePluginVersion %>" }
+
diff --git a/packages/nx-gradle/src/generators/init/files/gradle/catalog/spring-boot/libs.versions.toml b/packages/nx-gradle/src/generators/init/files/gradle/catalog/spring-boot/libs.versions.toml
index 6ed4ba908..31d210470 100644
--- a/packages/nx-gradle/src/generators/init/files/gradle/catalog/spring-boot/libs.versions.toml
+++ b/packages/nx-gradle/src/generators/init/files/gradle/catalog/spring-boot/libs.versions.toml
@@ -1,5 +1,14 @@
 [versions]
+java = "<%= javaVersion %>"
+kotlin = "<%= kotlinVersion %>"
+boot = "<%= springBootVersion %>"
 
 [libraries]
 
-[plugins]
\ No newline at end of file
+[plugins]
+springframework-boot = { id = "org.springframework.boot", version.ref = "boot" }
+spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.0" }
+github-khalilou88-jnxplus = { id = "io.github.khalilou88.jnxplus", version = "0.2.0" }
+jetbrains-kotlin-plugin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
+jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+
diff --git a/packages/nx-gradle/src/generators/init/files/gradle/config/kotlin-multiplatform/gradle.properties b/packages/nx-gradle/src/generators/init/files/gradle/config/kotlin-multiplatform/gradle.properties
index dd8994f2a..0909fd4ee 100644
--- a/packages/nx-gradle/src/generators/init/files/gradle/config/kotlin-multiplatform/gradle.properties
+++ b/packages/nx-gradle/src/generators/init/files/gradle/config/kotlin-multiplatform/gradle.properties
@@ -21,9 +21,9 @@ android.minSdk=24
 
 #Versions
 javaVersion=<%= javaVersion %>
-kotlin.version=1.8.20
-agp.version=7.4.2
-compose.version=1.4.1
+kotlin.version=<%= kotlinVersion %>
+agp.version=<%= agpVersion %>
+compose.version=<%= composeVersion %>
 jnxplusGradlePluginVersion=<%= jnxplusGradlePluginVersion %>