Skip to content

Commit

Permalink
Bump Kotlin to 1.6.21 (#149)
Browse files Browse the repository at this point in the history
Co-authored-by: hfhbd <[email protected]>
  • Loading branch information
hfhbd and hfhbd authored Apr 20, 2022
1 parent e6b8d11 commit 0e71f6e
Show file tree
Hide file tree
Showing 3 changed files with 200 additions and 111 deletions.
11 changes: 3 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import org.jetbrains.compose.*
import java.util.*

plugins {
kotlin("multiplatform") version "1.6.10"
id("org.jetbrains.compose") version "1.1.1"
kotlin("multiplatform") version "1.6.21"
id("org.jetbrains.compose") version "0.0.0-on-rebase-12-apr-2022-dev670"
`maven-publish`
signing
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
Expand Down Expand Up @@ -40,7 +40,7 @@ kotlin {
commonMain {
dependencies {
api(compose.runtime)
api("app.softwork:kotlinx-uuid-core:0.0.12")
api("app.softwork:kotlinx-uuid-core:0.0.14")
}
}
commonTest {
Expand Down Expand Up @@ -124,8 +124,3 @@ nexusPublishing {
}
}
}

rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
val nodeM1Version = "16.13.1"
rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion = nodeM1Version
}
2 changes: 0 additions & 2 deletions integrationTest/src/jsMain/kotlin/demo.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import org.jetbrains.compose.web.css.*
import org.jetbrains.compose.web.css.Color.black
import org.jetbrains.compose.web.css.Color.white
import org.jetbrains.compose.web.dom.*
import kotlin.time.*
import kotlin.time.Duration.Companion.seconds

@Composable
Expand Down Expand Up @@ -44,7 +43,6 @@ object DarkMode : StyleSheet() {
fun NavBuilder.Routing() {
var enableAnswer by remember { mutableStateOf(false) }
LaunchedEffect(Unit) {
@OptIn(ExperimentalTime::class)
delay(5.seconds)
enableAnswer = true
}
Expand Down
Loading

0 comments on commit 0e71f6e

Please sign in to comment.