Use Kotlin Wrappers version catalog

karakum-team · Aug 14, 2024 · f16625a · f16625a
1 parent f596816
commit f16625a
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 28 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Deps
 kotlin.version=2.0.0
-kotlin-wrappers.version=1.0.0-pre.786
+kotlin.wrappers.version=0.0.1-pre.791
 kfc.version=8.7.0
 seskar.version=3.6.0
 # MUI Deps

diff --git a/mui-kotlin/build.gradle.kts b/mui-kotlin/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
     `mui-declarations`
 }
 
-val kotlinWrappersVersion = property("kotlin-wrappers.version") as String
 val seskarVersion = property("seskar.version") as String
 
 dependencies {
@@ -18,7 +17,6 @@ dependencies {
 
     jsMainImplementation("io.github.turansky.seskar:seskar-core:$seskarVersion")
 
-    jsMainApi(enforcedPlatform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:$kotlinWrappersVersion"))
-    jsMainApi("org.jetbrains.kotlin-wrappers:kotlin-react-dom")
-    jsMainApi("org.jetbrains.kotlin-wrappers:kotlin-popper")
+    jsMainApi(libs.wrappers.react.dom)
+    jsMainApi(libs.wrappers.react.dom)
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/playground/build.gradle.kts b/playground/build.gradle.kts
@@ -2,13 +2,10 @@ plugins {
     id("io.github.turansky.kfc.application")
 }
 
-val kotlinWrappersVersion = property("kotlin-wrappers.version") as String
-
 dependencies {
-    jsMainImplementation(enforcedPlatform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:$kotlinWrappersVersion"))
-    jsMainImplementation("org.jetbrains.kotlin-wrappers:kotlin-emotion")
-    jsMainImplementation("org.jetbrains.kotlin-wrappers:kotlin-react")
-    jsMainImplementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom")
+    jsMainImplementation(libs.wrappers.emotion)
+    jsMainImplementation(libs.wrappers.react)
+    jsMainImplementation(libs.wrappers.react.dom)
 
     jsMainImplementation(project(":mui-kotlin"))
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -19,6 +19,13 @@ dependencyResolutionManagement {
     repositories {
         mavenCentral()
     }
+
+    versionCatalogs {
+        create("libs") {
+            val wrappersVersion = extra["kotlin.wrappers.version"]
+            from("org.jetbrains.kotlin-wrappers:kotlin-wrappers-catalog:$wrappersVersion")
+        }
+    }
 }
 
 include("mui-kotlin")