Kotlin 1.9.0 / Compose 1.5.2

kosi-libs · Oct 9, 2023 · 2610806 · 2610806
1 parent a62917b
commit 2610806
Show file tree

Hide file tree

Showing 8 changed files with 339 additions and 560 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 allprojects {
     group = "org.kodein.compose.html.pres"
-    version = "1.8.0"
+    version = "1.9.0"
 }
 
 task<Sync>("updateDemoDocs") {

diff --git a/compose-ur-pres/build.gradle.kts b/compose-ur-pres/build.gradle.kts
@@ -7,11 +7,15 @@ kotlin.kodein {
     jsEnvBrowserOnly()
     js {
         sources.mainDependencies {
+            api(libs.cssInComposable)
             implementation(kotlin.compose.html.core)
             implementation(kotlin.compose.runtime)
-            implementation(libs.cssInComposable)
         }
     }
+
+    // NOT USED - Workaround to make Dokka happy in MPP JS Only projects
+    // https://github.com/Kotlin/dokka/issues/3122
+    jvm()
 }
 
 kotlin.sourceSets.all {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
-compose = "1.4.0"
-cssInComposable = "1.4.0"
+compose = "1.5.2"
+cssInComposable = "1.5.0"
 highlightJs = "11.2.0"
-kxCoroutines = "1.7.0"
+kxCoroutines = "1.7.3"
 
 [plugins]
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }

diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
diff --git a/module/emojis/build.gradle.kts b/module/emojis/build.gradle.kts
@@ -12,4 +12,8 @@ kotlin.kodein {
             implementation(kotlin.compose.runtime)
         }
     }
+
+    // NOT USED - Workaround to make Dokka happy in MPP JS Only projects
+    // https://github.com/Kotlin/dokka/issues/3122
+    jvm()
 }
diff --git a/module/source-code/build.gradle.kts b/module/source-code/build.gradle.kts
@@ -13,6 +13,10 @@ kotlin.kodein {
             implementation(npm("highlight.js", "^${libs.versions.highlightJs.get()}"))
         }
     }
+
+    // NOT USED - Workaround to make Dokka happy in MPP JS Only projects
+    // https://github.com/Kotlin/dokka/issues/3122
+    jvm()
 }
 
 kotlin.sourceSets.all {

diff --git a/module/source-code/src/jsMain/kotlin/org/kodein/compose/html/pres/sourcecode/SourceCode.kt b/module/source-code/src/jsMain/kotlin/org/kodein/compose/html/pres/sourcecode/SourceCode.kt
@@ -1,10 +1,35 @@
 package org.kodein.compose.html.pres.sourcecode
 
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import kotlinx.browser.document
 import kotlinx.browser.window
-import org.jetbrains.compose.web.css.*
-import org.jetbrains.compose.web.dom.*
+import org.jetbrains.compose.web.css.Color
+import org.jetbrains.compose.web.css.DisplayStyle
+import org.jetbrains.compose.web.css.Position
+import org.jetbrains.compose.web.css.backgroundColor
+import org.jetbrains.compose.web.css.bottom
+import org.jetbrains.compose.web.css.cssRem
+import org.jetbrains.compose.web.css.cursor
+import org.jetbrains.compose.web.css.display
+import org.jetbrains.compose.web.css.fontSize
+import org.jetbrains.compose.web.css.position
+import org.jetbrains.compose.web.css.px
+import org.jetbrains.compose.web.css.right
+import org.jetbrains.compose.web.css.transform
+import org.jetbrains.compose.web.dom.AttrBuilderContext
+import org.jetbrains.compose.web.dom.Button
+import org.jetbrains.compose.web.dom.Code
+import org.jetbrains.compose.web.dom.ContentBuilder
+import org.jetbrains.compose.web.dom.ElementScope
+import org.jetbrains.compose.web.dom.Pre
+import org.jetbrains.compose.web.dom.Text
 import org.jetbrains.compose.web.renderComposable
 import org.kodein.compose.html.css.css
 import org.w3c.dom.HTMLElement

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
         maven(url = "https://raw.githubusercontent.com/kosi-libs/kodein-internal-gradle-plugin/mvn-repo")
     }
     dependencies {
-        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.1.2")
+        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.2.2")
     }
 }