Bump Kotlin to 2.0.0 and Compose Multiplatform to 1.6.10

huanshankeji · May 24, 2024 · a2aa9c7 · a2aa9c7
1 parent 2e37dd0
commit a2aa9c7
Show file tree

Hide file tree

Showing 5 changed files with 611 additions and 338 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .gradle
+.kotlin
 build
 local.properties
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -11,8 +11,10 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("gradle-plugin", "1.9.23"))
-    implementation("org.jetbrains.compose:compose-gradle-plugin:1.6.2")
+    val kotlinVersion = "2.0.0"
+    implementation(kotlin("gradle-plugin", kotlinVersion))
+    implementation("org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion")
+    implementation("org.jetbrains.compose:compose-gradle-plugin:1.6.10")
     implementation("com.huanshankeji.team:gradle-plugins:0.5.1")
     implementation("com.android.tools.build:gradle:8.2.2")
     implementation("com.huanshankeji:common-gradle-dependencies:0.7.1-20240516")

diff --git a/buildSrc/src/main/kotlin/common-conventions.gradle.kts b/buildSrc/src/main/kotlin/common-conventions.gradle.kts
@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
+    kotlin("plugin.compose")
     id("org.jetbrains.compose")
 }
 

diff --git a/...ltiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Snackbar.js.kt b/...ltiplatform-material2/src/jsMain/kotlin/com/huanshankeji/compose/material2/Snackbar.js.kt
@@ -4,7 +4,6 @@ import androidx.compose.runtime.Composable
 import com.huanshankeji.compose.ui.Modifier
 import com.huanshankeji.compose.ui.toAttrs
 import dev.petuska.kmdc.core.MDCAttrs
-import dev.petuska.kmdc.core.MDCContent
 import dev.petuska.kmdc.snackbar.*
 
 private fun Boolean.actionOnNewLineToType() =
@@ -18,13 +17,13 @@ internal fun CommonSnackbar(
     timeoutMs: Int?,
     modifier: Modifier,
     attrs: MDCAttrs<MDCSnackbarAttrsScope>?,
-    mdcSnackbarContent: MDCContent<MDCSnackbarScope>?,
-    actions: MDCContent<MDCSnackbarActionsScope>?,
+    mdcSnackbarContent: @Composable MDCSnackbarScope.() -> Unit?, // `MDCContent<MDCSnackbarScope>?` not working here since Kotlin 2.0.0
+    actions: @Composable MDCSnackbarActionsScope.() -> Unit?, //MDCContent<MDCSnackbarActionsScope>?,
 ) =
     MDCSnackbar(actionOnNewLine.actionOnNewLineToType(), open, timeoutMs, attrs = modifier.toAttrs(attrs)) {
-        mdcSnackbarContent?.invoke(this)
+        mdcSnackbarContent.invoke(this)
 
-        actions?.let {
+        actions.let {
             Actions {
                 it()
             }
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     .gradle
+    .kotlin
     build
     local.properties
@@ Expand Down @@