Cleanup kotlin wrapper dependencies

2 files changed, 22 insertions, 39 deletions

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dfa1ddd2..086c667e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,17 +7,13 @@ loki-logback-appender = "1.0.0"
 micrometer-registry-prometheus = "1.6.1"
 slf4j = "1.7.30"
 
-# Frontend wrapper versions from https://github.com/JetBrains/kotlin-wrappers/blob/master/gradle.properties
-kotlin-wrappers = "pre.242-kotlin-1.5.30"
-react = "17.0.2"
-reactRedux = "7.2.4"
-reactRouterDom = "5.2.0"
-redux = "4.1.1"
-styledComponents = "5.3.1"
+kotlin-react = "17.0.2-pre.242-kotlin-1.5.30"
+kotlin-reactRedux = "7.2.4-pre.242-kotlin-1.5.30"
+kotlin-reactRouterDom = "5.2.0-pre.242-kotlin-1.5.30"
+kotlin-styled = "5.3.1-pre.242-kotlin-1.5.30"
 
-blueprintjs-wrapper = "4"
-blueprintjs-core = "3.49.1"
-blueprintjs-icons = "3.29.0"
+kotlin-blueprintjs-core = "3.49.1-4"
+kotlin-blueprintjs-icons = "3.29.0-4"
 
 [libraries]
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
@@ -29,3 +25,12 @@ logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "lo
 loki-logback-appender = { module = "com.github.loki4j:loki-logback-appender", version.ref = "loki-logback-appender" }
 micrometer-registry-prometheus = { module = "io.micrometer:micrometer-registry-prometheus", version.ref = "micrometer-registry-prometheus" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+
+kotlin-wrappers-react-base = { module = "org.jetbrains.kotlin-wrappers:kotlin-react", version.ref = "kotlin-react" }
+kotlin-wrappers-react-dom = { module = "org.jetbrains.kotlin-wrappers:kotlin-react-dom", version.ref = "kotlin-react" }
+kotlin-wrappers-react-redux = { module = "org.jetbrains.kotlin-wrappers:kotlin-react-redux", version.ref = "kotlin-reactRedux" }
+kotlin-wrappers-react-router-dom = { module = "org.jetbrains.kotlin-wrappers:kotlin-react-router-dom", version.ref = "kotlin-reactRouterDom" }
+kotlin-wrappers-styled = { module = "org.jetbrains.kotlin-wrappers:kotlin-styled", version.ref = "kotlin-styled" }
+
+kotlin-wrappers-blueprintjs-core = { module = "org.hildan.blueprintjs:kotlin-blueprintjs-core", version.ref = "kotlin-blueprintjs-core" }
+kotlin-wrappers-blueprintjs-icons = { module = "org.hildan.blueprintjs:kotlin-blueprintjs-icons", version.ref = "kotlin-blueprintjs-icons" }
diff --git a/sw-ui/build.gradle.kts b/sw-ui/build.gradle.kts
index 46352f1b..fbe51d3e 100644
--- a/sw-ui/build.gradle.kts
+++ b/sw-ui/build.gradle.kts
@@ -4,8 +4,6 @@ plugins {
     kotlin("js")
 }
 
-val kotlinWrappersVersion = libs.versions.kotlin.wrappers.get()
-
 kotlin {
     js {
         browser()
@@ -16,33 +14,13 @@ kotlin {
             dependencies {
                 implementation(projects.swClient)
 
-                val reactVersion = libs.versions.react.get()
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-react:$reactVersion-$kotlinWrappersVersion")
-                implementation(npm("react", reactVersion))
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:$reactVersion-$kotlinWrappersVersion")
-                implementation(npm("react-dom", reactVersion))
-
-                val reactReduxVersion = libs.versions.reactRedux.get()
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-react-redux:$reactReduxVersion-$kotlinWrappersVersion")
-                implementation(npm("react-redux", reactReduxVersion))
-                implementation(npm("redux", libs.versions.redux.get()))
-
-                val reactRouterDomVersion = libs.versions.reactRouterDom.get()
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-react-router-dom:$reactRouterDomVersion-$kotlinWrappersVersion")
-                implementation(npm("react-router-dom", reactRouterDomVersion))
-
-                val styledComponentsVersion = libs.versions.styledComponents.get()
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-styled:$styledComponentsVersion-$kotlinWrappersVersion")
-                implementation(npm("styled-components", styledComponentsVersion))
-                implementation(npm("inline-style-prefixer", "6.0.0")) // FIXME is this still needed
-
-                val bpWrapperVersion = libs.versions.blueprintjs.wrapper.get()
-                val bpCoreVersion = libs.versions.blueprintjs.core.get()
-                val bpIconsVersion = libs.versions.blueprintjs.icons.get()
-                implementation("org.hildan.blueprintjs:kotlin-blueprintjs-core:$bpCoreVersion-$bpWrapperVersion")
-                implementation("org.hildan.blueprintjs:kotlin-blueprintjs-icons:$bpIconsVersion-$bpWrapperVersion")
-                implementation(npm("@blueprintjs/core", bpCoreVersion))
-                implementation(npm("@blueprintjs/icons", bpIconsVersion))
+                implementation(libs.kotlin.wrappers.react.base)
+                implementation(libs.kotlin.wrappers.react.dom)
+                implementation(libs.kotlin.wrappers.react.redux)
+                implementation(libs.kotlin.wrappers.react.router.dom)
+                implementation(libs.kotlin.wrappers.styled)
+                implementation(libs.kotlin.wrappers.blueprintjs.core)
+                implementation(libs.kotlin.wrappers.blueprintjs.icons)
             }
         }
         test {