Merge branch 'main' into renovate/com.squareup.okio-okio-3.x

ashdavies · Feb 11, 2024 · e1dc1e0 · e1dc1e0
2 parents 867bd0d + 82391d7
commit e1dc1e0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app-launcher/android/src/androidMain/kotlin/io/ashdavies/playground/LauncherActivity.kt b/app-launcher/android/src/androidMain/kotlin/io/ashdavies/playground/LauncherActivity.kt
@@ -33,7 +33,7 @@ internal class LauncherActivity : ComposeActivity(content = {
 
                     NavigableCircuitContent(
                         navigator = rememberCircuitNavigator(backStack),
-                        backstack = backStack,
+                        backStack = backStack,
                     )
                 }
             }

diff --git a/app-launcher/desktop/src/jvmMain/kotlin/io/ashdavies/playground/LauncherMain.kt b/app-launcher/desktop/src/jvmMain/kotlin/io/ashdavies/playground/LauncherMain.kt
@@ -44,7 +44,7 @@ public fun main(args: Array<String>) {
 
                         NavigableCircuitContent(
                             navigator = rememberCircuitNavigator(backStack, ::exitApplication),
-                            backstack = backStack,
+                            backStack = backStack,
                             decoration = KeyNavigationDecoration(
                                 decoration = circuit.defaultNavDecoration,
                                 onBackInvoked = backStack::pop,

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ gitlive-firebase = "1.11.1"
 google-accompanist = "0.34.0"
 google-android = "8.2.2"
 google-maps-compose = "4.3.2"
-google-services = "4.4.0"
+google-services = "4.4.1"
 jetbrains-compose = "1.5.12"
 jetbrains-kotlin = "1.9.22"
 kotlin-jvmTarget = "17"
@@ -19,7 +19,7 @@ kotlinx-serialization = "1.6.2"
 ktor = "2.3.8"
 paging-compose = "3.2.0-alpha05-0.2.3"
 pinterest-ktlint = "0.50.0"
-slack-circuit = "0.18.2"
+slack-circuit = "0.19.0"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
@@ -134,4 +134,4 @@ kotlin-compose = { id = "org.jetbrains.compose", version.ref = "jetbrains-compos
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "jetbrains-kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "jetbrains-kotlin" }
 kotlinx-kover = "org.jetbrains.kotlinx.kover:0.7.5"
-openapi-generator = "org.openapi.generator:7.2.0"
+openapi-generator = "org.openapi.generator:7.3.0"