Update dependencies

- Support iosSimulatorArm64
- Minor cleanup

core/build.gradle.kts

@@ -26,7 +26,7 @@ kotlin {
     }
     iosX64()
     iosArm64()
-    //iosSimulatorArm64()
+    iosSimulatorArm64()
 
     sourceSets {
         all {
@@ -103,11 +103,13 @@ kotlin {
             dependsOn(commonTest)
         }
 
-        listOf("iosX64Main", "iosArm64Main"/*, "iosSimulatorArm64Main"*/).forEach {
-            getByName(it).dependsOn(iosMain)
-        }
-        listOf("iosX64Test", "iosArm64Test"/*, "iosSimulatorArm64Test"*/).forEach {
-            getByName(it).dependsOn(iosTest)
+        listOf(
+            "iosX64",
+            "iosArm64",
+            "iosSimulatorArm64",
+        ).forEach {
+            getByName(it + "Main").dependsOn(iosMain)
+            getByName(it + "Test").dependsOn(iosTest)
         }
     }
 }

data/build.gradle.kts

@@ -25,7 +25,7 @@ kotlin {
     }
     iosX64()
     iosArm64()
-    //iosSimulatorArm64()
+    iosSimulatorArm64()
 
     sourceSets {
         all {
@@ -91,11 +91,13 @@ kotlin {
             dependsOn(commonTest)
         }
 
-        listOf("iosX64Main", "iosArm64Main"/*, "iosSimulatorArm64Main"*/).forEach {
-            getByName(it).dependsOn(iosMain)
-        }
-        listOf("iosX64Test", "iosArm64Test"/*, "iosSimulatorArm64Test"*/).forEach {
-            getByName(it).dependsOn(iosTest)
+        listOf(
+            "iosX64",
+            "iosArm64",
+            "iosSimulatorArm64",
+        ).forEach {
+            getByName(it + "Main").dependsOn(iosMain)
+            getByName(it + "Test").dependsOn(iosTest)
         }
     }
 }

domain/build.gradle.kts

@@ -25,7 +25,7 @@ kotlin {
     }
     iosX64()
     iosArm64()
-    //iosSimulatorArm64()
+    iosSimulatorArm64()
 
     sourceSets {
         all {
@@ -99,11 +99,13 @@ kotlin {
             dependsOn(commonTest)
         }
 
-        listOf("iosX64Main", "iosArm64Main"/*, "iosSimulatorArm64Main"*/).forEach {
-            getByName(it).dependsOn(iosMain)
-        }
-        listOf("iosX64Test", "iosArm64Test"/*, "iosSimulatorArm64Test"*/).forEach {
-            getByName(it).dependsOn(iosTest)
+        listOf(
+            "iosX64",
+            "iosArm64",
+            "iosSimulatorArm64",
+        ).forEach {
+            getByName(it + "Main").dependsOn(iosMain)
+            getByName(it + "Test").dependsOn(iosTest)
         }
     }
 }

gradle/libs.versions.toml

@@ -7,24 +7,24 @@ coroutines = "1.6.4"
 json = "1.4.0"
 
 # Compose
-composeGradle = "1.2.0-alpha01-dev770"
+composeGradle = "1.2.0-beta01"
 composeCompiler = "1.3.0"
 composeAndroid = "1.2.1"
 voyager = "1.0.0-beta16"
-accompanist = "0.25.1"
+accompanist = "0.25.2"
 googleAccompanist = "0.25.1"
-imageloader = "1.1.7"
+imageloader = "1.1.8"
 materialDialogs = "0.8.0"
 
 # Android
 androidGradle = "7.3.0-rc01"
-core = "1.8.0"
-appCompat = "1.6.0-beta01"
+core = "1.9.0"
+appCompat = "1.6.0-rc01"
 activityCompose = "1.5.1"
 work = "2.7.1"
 
 # Android Lifecycle
-lifecycle = "2.6.0-alpha01"
+lifecycle = "2.6.0-alpha02"
 
 # Swing
 darklaf = "3.0.1"
@@ -36,7 +36,7 @@ ksp = "1.7.10-1.0.6"
 kotlinInject = "0.5.1"
 
 # Network
-ktor = "2.1.0"
+ktor = "2.1.1"
 
 # Logging
 slf4j = "1.7.36"
@@ -52,7 +52,7 @@ appDirs = "1.2.1"
 multiplatformSettings = "1.0.0-alpha01"
 
 # Utility
-kroki = "1.22"
+kroki = "1.23"
 desugarJdkLibs = "1.2.2"
 aboutLibraries = "10.4.0"
 dateTime = "0.4.0"

i18n/build.gradle.kts

@@ -22,6 +22,7 @@ kotlin {
     }
     iosX64()
     iosArm64()
+    iosSimulatorArm64()
 
     sourceSets {
         val commonMain by getting {

presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/globalsearch/GlobalSearchScreen.kt

@@ -8,6 +8,7 @@ package ca.gosyer.jui.ui.sources.globalsearch
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
+import ca.gosyer.jui.ui.manga.MangaScreen
 import ca.gosyer.jui.ui.sources.browse.SourceScreen
 import ca.gosyer.jui.ui.sources.components.LocalSourcesNavigator
 import ca.gosyer.jui.ui.sources.globalsearch.components.GlobalSearchScreenContent
@@ -45,7 +46,7 @@ class GlobalSearchScreen(private val initialQuery: String) : Screen {
                 }
             },
             onMangaClick = {
-                navigator push ca.gosyer.jui.ui.manga.MangaScreen(it.id)
+                navigator push MangaScreen(it.id)
             }
         )
     }

ui-core/src/commonMain/kotlin/ca/gosyer/jui/uicore/vm/ViewModel.kt

@@ -44,4 +44,9 @@ abstract class ViewModel(private val contextWrapper: ContextWrapper) : ScreenMod
             contextWrapper.toast(string, length)
         }
     }
+
+    @Suppress("RedundantOverride") // So classes that inherit ViewModel can see it
+    override fun onDispose() {
+        super.onDispose()
+    }
 }