Add Dev Kotlin version and update versions.

vaginessa · Oct 13, 2021 · 766e8d2 · 766e8d2
1 parent eb28edd
commit 766e8d2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 43 deletions.
diff --git a/src/commonMain/kotlin/org/jetbrains/webwiz/generator/files/RootBuildGradle.kt b/src/commonMain/kotlin/org/jetbrains/webwiz/generator/files/RootBuildGradle.kt
@@ -18,7 +18,7 @@ buildscript {
         gradlePluginPortal()
         google()
         mavenCentral()
-        ${if (projectInfo.kotlinVersion == KotlinVersion.EAP) "maven(\"https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/\")" else NAN}
+        ${if (projectInfo.kotlinVersion == KotlinVersion.Dev) "maven(\"https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/\")" else NAN}
     }
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${projectInfo.kotlinVersion.versionName}")
@@ -31,7 +31,7 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        ${if (projectInfo.kotlinVersion == KotlinVersion.EAP) "maven(\"https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/\")" else NAN}
+        ${if (projectInfo.kotlinVersion == KotlinVersion.Dev) "maven(\"https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/\")" else NAN}
     }
 }
     """.trimIndent().deleteNans()

diff --git a/src/commonMain/kotlin/org/jetbrains/webwiz/models/KotlinVersions.kt b/src/commonMain/kotlin/org/jetbrains/webwiz/models/KotlinVersions.kt
@@ -1,6 +1,7 @@
 package org.jetbrains.webwiz.models
 
 enum class KotlinVersion(val versionName: String) {
-    Stable("1.5.30"),
-    EAP("1.6.0-M1-329")
+    Stable("1.5.31"),
+    EAP("1.6.0-RC"),
+    Dev("1.6.20-dev-967")
 }
diff --git a/src/jsMain/kotlin/org/jetbrains/webwiz/content/CodeSamplesSwitcher.kt b/src/jsMain/kotlin/org/jetbrains/webwiz/content/CodeSamplesSwitcher.kt
@@ -7,26 +7,29 @@ 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.webwiz.style.AppStylesheet
+import org.jetbrains.compose.web.dom.Form
+import org.jetbrains.compose.web.dom.Input
+import org.jetbrains.compose.web.dom.Label
+import org.jetbrains.compose.web.dom.Text
 import org.jetbrains.webwiz.models.KotlinVersion
-import org.jetbrains.compose.web.dom.*
+import org.jetbrains.webwiz.style.AppStylesheet
 
 private object SwitcherVariables {
     val labelWidth by variable<CSSpxValue>()
     val labelPadding by variable<CSSpxValue>()
 }
 
 @Composable
-fun KotlinVersionSwitcher(versions: Array<KotlinVersion>, state: Map<KotlinVersion, Boolean>, onSelect: (KotlinVersion) -> Unit) {
+fun KotlinVersionSwitcher(state: KotlinVersion, onSelect: (KotlinVersion) -> Unit) {
     Form(attrs = {
         classes(KotlinSwitcherStylesheet.boxed)
     }) {
-        versions.forEach { version ->
+        KotlinVersion.values().forEach { version ->
             Input(type = InputType.Radio, attrs = {
                 name("code-snippet")
                 value("snippet$version")
                 id("snippet$version")
-                checked(state[version]!!)
+                checked(version == state)
                 onClick { onSelect(version) }
             })
             Label(forId = "snippet$version") { Text("${version.name}") }
@@ -38,13 +41,6 @@ fun KotlinVersionSwitcher(versions: Array<KotlinVersion>, state: Map<KotlinVersi
 object KotlinSwitcherStylesheet : StyleSheet(AppStylesheet) {
     val boxed by style {
 
-        media(mediaMaxWidth(202.px)) {
-            self style {
-                SwitcherVariables.labelWidth(36.px)
-                SwitcherVariables.labelPadding(5.px)
-            }
-        }
-
         backgroundColor(Color("rgb(244,244,244)"))
 
         descendant(self, CSSSelector.Type("label")) style {

diff --git a/src/jsMain/kotlin/org/jetbrains/webwiz/content/WizardSection.kt b/src/jsMain/kotlin/org/jetbrains/webwiz/content/WizardSection.kt
@@ -36,8 +36,6 @@ private val defaultProject = ProjectInfo(
 
 internal val projectInfoState = mutableStateOf(defaultProject)
 
-val switcherState = mutableStateOf(mapOf(KotlinVersion.EAP to false, KotlinVersion.Stable to true))
-
 @Composable
 @OptIn(ExperimentalComposeWebWidgetsApi::class)
 fun WizardSection(callback: (projectInfo: ProjectInfo) -> Unit) = Section({
@@ -100,25 +98,9 @@ fun WizardSection(callback: (projectInfo: ProjectInfo) -> Unit) = Section({
                         Text("Kotlin version")
                     }
 
-                    Div({ classes(WtOffsets.kotlinSwitcherStyle) }) {
-                        KotlinVersionSwitcher(
-                            KotlinVersion.values(),
-                            switcherState.value
-                        )
-                        {
+                    Div {
+                        KotlinVersionSwitcher(projectInfoState.value.kotlinVersion) {
                             projectInfoState.value = projectInfoState.value.copy(kotlinVersion = it)
-                            switcherState.value = mapOf(
-                                KotlinVersion.EAP to (
-                                    when (it) {
-                                        KotlinVersion.EAP -> !switcherState.value[KotlinVersion.EAP]!!
-                                        KotlinVersion.Stable -> switcherState.value[KotlinVersion.Stable]!!
-                                    }),
-                                KotlinVersion.Stable to (
-                                    when (it) {
-                                        KotlinVersion.EAP -> switcherState.value[KotlinVersion.EAP]!!
-                                        KotlinVersion.Stable -> !switcherState.value[KotlinVersion.Stable]!!
-                                    })
-                            )
                         }
                     }
                 }

diff --git a/src/jsMain/kotlin/org/jetbrains/webwiz/style/WtOffest.kt b/src/jsMain/kotlin/org/jetbrains/webwiz/style/WtOffest.kt
@@ -2,10 +2,8 @@ package org.jetbrains.webwiz.style
 
 import org.jetbrains.compose.web.ExperimentalComposeWebApi
 import org.jetbrains.compose.web.css.*
-import org.jetbrains.compose.web.css.keywords.CSSAutoKeyword
 import org.jetbrains.compose.web.css.selectors.descendant
 import org.jetbrains.compose.web.css.selectors.selector
-import org.jetbrains.compose.web.css.selectors.type
 
 object WtOffsets : StyleSheet(AppStylesheet) {
     val wtTopOffset96 by style {
@@ -44,11 +42,6 @@ object WtOffsets : StyleSheet(AppStylesheet) {
         }
     }
 
-    val kotlinSwitcherStyle by style {
-        maxWidth(202.px)
-        minWidth(202.px)
-    }
-
     val textInputLabelsStyle by style {
         width(20.percent)
         display(DisplayStyle.InlineBlock)