From 79dddec48bd53ab5c8e0b3d0fef9ef8f5184910c Mon Sep 17 00:00:00 2001
From: Danil Nikolaev <lischenkodev@gmail.com>
Date: Sat, 11 Jan 2025 07:25:50 +0300
Subject: [PATCH] chore: libs update fix for wasm

---
 composeApp/build.gradle.kts                                  | 4 ++++
 .../screens/requests/presentation/RequestsScreen.kt          | 5 +----
 .../meloda/overseerr/screens/url/presentation/UrlScreen.kt   | 1 -
 gradle.properties                                            | 1 -
 gradle/libs.versions.toml                                    | 3 +++
 settings.gradle.kts                                          | 1 +
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
index 072accf..b16b08b 100644
--- a/composeApp/build.gradle.kts
+++ b/composeApp/build.gradle.kts
@@ -21,12 +21,14 @@ kotlin {
     wasmJs {
         moduleName = "composeApp"
         browser {
+            val rootDirPath = project.rootDir.path
             val projectDirPath = project.projectDir.path
             commonWebpackConfig {
                 outputFileName = "composeApp.js"
                 devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply {
                     static = (static ?: mutableListOf()).apply {
                         // Serve sources to debug inside browser
+                        add(rootDirPath)
                         add(projectDirPath)
                     }
                 }
@@ -83,7 +85,9 @@ kotlin {
             implementation(libs.koin.core)
             implementation(libs.koin.compose)
             implementation(libs.koin.compose.viewmodel)
+            implementation(libs.androidx.lifecycle.viewmodel)
             implementation(libs.androidx.lifecycle.viewmodel.compose)
+            implementation(libs.androidx.lifecycle.runtime.compose)
             implementation(libs.haze)
             implementation(libs.haze.materials)
             implementation(libs.kstore)
diff --git a/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/screens/requests/presentation/RequestsScreen.kt b/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/screens/requests/presentation/RequestsScreen.kt
index 2c591aa..ca7b784 100644
--- a/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/screens/requests/presentation/RequestsScreen.kt
+++ b/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/screens/requests/presentation/RequestsScreen.kt
@@ -106,10 +106,7 @@ class RequestsScreen : Screen {
                 LazyColumn(
                     modifier = Modifier
                         .fillMaxSize()
-                        .haze(
-                            state = hazeState,
-                            style = hazeStyle
-                        )
+                        .haze(state = hazeState)
                         .pullToRefresh(
                             isRefreshing = screenState.isLoading,
                             state = refreshState,
diff --git a/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/screens/url/presentation/UrlScreen.kt b/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/screens/url/presentation/UrlScreen.kt
index f25e643..3759d8e 100644
--- a/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/screens/url/presentation/UrlScreen.kt
+++ b/composeApp/src/commonMain/kotlin/dev/meloda/overseerr/screens/url/presentation/UrlScreen.kt
@@ -6,7 +6,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.rounded.ArrowBack
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/gradle.properties b/gradle.properties
index c5b001b..b39193c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,6 @@ org.gradle.parallel=true
 
 #Kotlin
 kotlin.code.style=official
-kotlin.js.compiler=ir
 kotlin.daemon.jvmargs=-Xmx4G
 kotlin.native.ignoreDisabledTargets=true
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ef696ad..ac677b7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,6 +3,7 @@
 kotlin = "2.0.20-RC"
 compose = "1.7.0-alpha02"
 agp = "8.2.0"
+androidx-lifecycle = "2.8.4"
 androidx-activityCompose = "1.9.1"
 androidx-uiTest = "1.6.8"
 voyager = "1.1.0-beta02"
@@ -21,6 +22,8 @@ napier = "2.7.1"
 
 androidx-activityCompose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
 androidx-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "viewmodel-compose" }
+androidx-lifecycle-viewmodel = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-runtime-compose = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
 androidx-uitest-testManifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-uiTest" }
 androidx-uitest-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-uiTest" }
 voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 80c15fa..f2308ff 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,4 +1,5 @@
 rootProject.name = "Overseerr"
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 pluginManagement {
     repositories {