Merge pull request #83 from Irineu333/chore/update-cmp-1.9.0

Irineu333 · web-flow · commit f8fc96a8bda8 · 2025-09-13T17:28:33.000-03:00
Update CMP to 1.9.0
diff --git a/application/src/webMain/kotlin/com/neoutils/neoregex/Main.web.kt b/application/src/webMain/kotlin/com/neoutils/neoregex/Main.web.kt
@@ -19,9 +19,8 @@
 package com.neoutils.neoregex
 
 import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.window.CanvasBasedWindow
+import androidx.compose.ui.window.ComposeViewport
 import com.neoutils.neoregex.core.common.di.commonModule
-import com.neoutils.neoregex.core.common.util.SizeManager
 import com.neoutils.neoregex.core.crashreport.CrashReportHelper
 import com.neoutils.neoregex.core.crashreport.di.crashReportModule
 import com.neoutils.neoregex.core.database.di.databaseModule
@@ -30,8 +29,6 @@ import com.neoutils.neoregex.core.manager.di.managerModule
 import com.neoutils.neoregex.core.repository.di.repositoryModule
 import com.neoutils.neoregex.feature.matcher.di.matcherModule
 import com.neoutils.neoregex.feature.validator.di.validatorModule
-import kotlinx.coroutines.flow.first
-import org.jetbrains.skiko.wasm.onWasmReady
 import org.koin.core.context.startKoin
 
 @OptIn(ExperimentalComposeUiApi::class)
@@ -52,18 +49,7 @@ fun main() {
 
     CrashReportHelper.service.setup()
 
-    val sizeManager = SizeManager().apply { resize() }
-
-    onWasmReady {
-        CanvasBasedWindow(
-            canvasElementId = "viewport-container",
-            applyDefaultStyles = false,
-            requestResize = {
-                sizeManager.changes.first()
-            }
-        ) {
-            WebApp()
-        }
+    ComposeViewport {
+        WebApp()
     }
 }
-
diff --git a/application/src/webMain/resources/index.html b/application/src/webMain/resources/index.html
@@ -1,14 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+    <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="icon" href="favicon.ico" type="image/x-icon">
     <title>NeoRegex</title>
-    <script src="skiko.js"></script>
+    <link rel="icon" href="favicon.ico" type="image/x-icon">
     <link type="text/css" rel="stylesheet" href="styles.css">
 </head>
 <body>
-<canvas id="viewport-container"></canvas>
 <script src="app.js"></script>
 </body>
 </html>
diff --git a/application/src/webMain/resources/styles.css b/application/src/webMain/resources/styles.css
@@ -3,6 +3,5 @@ html, body {
     height: 100%;
     margin: 0;
     padding: 0;
-    display: block;
     overflow: hidden;
 }
diff --git a/core/common/src/webMain/kotlin/com/neoutils/neoregex/core/common/util/SizeManager.kt b/core/common/src/webMain/kotlin/com/neoutils/neoregex/core/common/util/SizeManager.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 agp = "8.6.1" # requires Gradle 8.6+
 kotlin = "2.1.21" # recommends Gradle 8.6+ and JDK 17+
-cmp = "1.8.2" # requires Kotlin 2.1.0+ and compileSdk 35+
+cmp = "1.9.0-rc01" # requires Kotlin 2.1.0+ and compileSdk 35+
 
 android-compileSdk = "35" # recommends AGP 8.6.0+
 android-minSdk = "24"

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,5 @@ html, body {`
`3`	`3`	`height: 100%;`
`4`	`4`	`margin: 0;`
`5`	`5`	`padding: 0;`
`6`		`- display: block;`
`7`	`6`	`overflow: hidden;`
`8`	`7`	`}`