Update project kotlin and compose versions.

vaginessa · Jan 4, 2022 · 99521ee · 99521ee
1 parent bde9169
commit 99521ee
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,8 +2,8 @@ import org.jetbrains.compose.compose
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 
 plugins {
-    kotlin("multiplatform") version "1.5.31"
-    id("org.jetbrains.compose") version "1.0.0-beta5"
+    kotlin("multiplatform") version "1.6.10"
+    id("org.jetbrains.compose") version "1.0.1"
 }
 
 repositories {
@@ -43,12 +43,4 @@ kotlin {
             }
         }
     }
-}
-
-// a temporary workaround for a bug in jsRun invocation - see https://youtrack.jetbrains.com/issue/KT-48273
-afterEvaluate {
-    rootProject.extensions.configure<NodeJsRootExtension> {
-        versions.webpackDevServer.version = "4.0.0"
-        versions.webpackCli.version = "4.9.0"
-    }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/jsMain/kotlin/org/jetbrains/webwiz/content/CodeSamplesSwitcher.kt b/src/jsMain/kotlin/org/jetbrains/webwiz/content/CodeSamplesSwitcher.kt
@@ -5,8 +5,6 @@ import org.jetbrains.compose.web.attributes.InputType
 import org.jetbrains.compose.web.attributes.name
 import org.jetbrains.compose.web.css.*
 import org.jetbrains.compose.web.css.selectors.CSSSelector
-import org.jetbrains.compose.web.css.selectors.descendant
-import org.jetbrains.compose.web.css.selectors.selector
 import org.jetbrains.compose.web.dom.Form
 import org.jetbrains.compose.web.dom.Input
 import org.jetbrains.compose.web.dom.Label
@@ -43,7 +41,7 @@ object KotlinSwitcherStylesheet : StyleSheet(AppStylesheet) {
 
         backgroundColor(Color("rgb(244,244,244)"))
 
-        descendant(self, CSSSelector.Type("label")) style {
+        desc(self, type("label")) style {
             display(DisplayStyle.InlineBlock)
             width(SwitcherVariables.labelWidth.value(100.px))
             padding(SwitcherVariables.labelPadding.value(5.px))
@@ -68,12 +66,12 @@ object KotlinSwitcherStylesheet : StyleSheet(AppStylesheet) {
             borderRadius(22.px, 22.px, 22.px)
         }
 
-        descendant(self, selector("input[type=\"radio\"]")) style {
+        desc(self, selector("input[type=\"radio\"]")) style {
             display(DisplayStyle.None)
 
         }
 
-        descendant(self, selector("input[type=\"radio\"]:checked + label")) style {
+        desc(self, selector("input[type=\"radio\"]:checked + label")) style {
             border {
                 style(LineStyle.Solid)
                 width(3.px)

diff --git a/src/jsMain/kotlin/org/jetbrains/webwiz/style/Stylesheet.kt b/src/jsMain/kotlin/org/jetbrains/webwiz/style/Stylesheet.kt
@@ -37,7 +37,7 @@ object AppStylesheet : StyleSheet() {
             )
         }
 
-        CSSSelector.Universal style {
+        universal style {
             AppCSSVariables.wtColorGreyLight(Color("#f4f4f4"))
             AppCSSVariables.wtColorGreyDark(Color("#323236"))
             AppCSSVariables.wtOffsetTopUnit(24.px)
@@ -46,13 +46,13 @@ object AppStylesheet : StyleSheet() {
         }
 
         media(mediaMaxWidth(640.px)) {
-            CSSSelector.Universal style {
+            universal style {
                 AppCSSVariables.wtOffsetTopUnit(16.px)
                 AppCSSVariables.wtFlowUnit(16.px)
             }
         }
 
-        CSSSelector.Attribute(
+        attr(
             name = "class",
             value = "wtCol",
             operator = CSSSelector.Attribute.Operator.Contains

diff --git a/src/jsMain/kotlin/org/jetbrains/webwiz/style/WtOffest.kt b/src/jsMain/kotlin/org/jetbrains/webwiz/style/WtOffest.kt
@@ -2,8 +2,6 @@ package org.jetbrains.webwiz.style
 
 import org.jetbrains.compose.web.ExperimentalComposeWebApi
 import org.jetbrains.compose.web.css.*
-import org.jetbrains.compose.web.css.selectors.descendant
-import org.jetbrains.compose.web.css.selectors.selector
 
 object WtOffsets : StyleSheet(AppStylesheet) {
     val wtTopOffset96 by style {

diff --git a/src/jsMain/kotlin/org/jetbrains/webwiz/style/WtText.kt b/src/jsMain/kotlin/org/jetbrains/webwiz/style/WtText.kt
@@ -1,7 +1,6 @@
 package org.jetbrains.webwiz.style
 
 import org.jetbrains.compose.web.css.*
-import org.jetbrains.compose.web.css.selectors.hover
 
 object WtTexts : StyleSheet(AppStylesheet) {