Update to latest deps

aaalaniz · Feb 29, 2024 · 8f39d96 · 8f39d96
1 parent d33c2c4
commit 8f39d96
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 35 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
 core-splashscreen = "1.0.1"
-kotlin = "1.9.20"
-agp = "8.1.0"
-compose = "1.5.11"
+kotlin = "1.9.22"
+agp = "8.2.2"
+compose = "1.5.12"
 ksp = "1.9.21-1.0.15"
 kotlin-inject = "0.6.3"
-circuit = "0.17.0"
-androidx-activity-compose = "1.8.1"
+circuit = "0.19.1"
+androidx-activity-compose = "1.8.2"
 androidx-appcompat = "1.6.1"
 androidx-core-ktx = "1.12.0"
-datastore-version = "1.1.0-alpha07"
+datastore-version = "1.1.0-beta01"
 
 [libraries]
 androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "core-splashscreen" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Aug 30 21:10:07 CDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -9,8 +9,6 @@ plugins {
 
 kotlin {
     androidTarget()
-
-    ios()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
@@ -28,7 +26,7 @@ kotlin {
     }
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(compose.runtime)
                 implementation(compose.foundation)
@@ -42,38 +40,18 @@ kotlin {
                 implementation(libs.androidx.datastore.core.okio)
             }
         }
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 implementation(libs.kotlin.test)
             }
         }
-        val androidMain by getting {
+        androidMain {
             dependencies {
                 api(libs.androidx.activity.compose)
                 api(libs.androidx.appcompat)
                 api(libs.androidx.core.ktx)
             }
         }
-        val androidUnitTest by getting
-        val iosX64Main by getting
-        val iosArm64Main by getting
-        val iosSimulatorArm64Main by getting
-        val iosMain by getting {
-            dependsOn(commonMain)
-            iosX64Main.dependsOn(this)
-            iosArm64Main.dependsOn(this)
-            iosSimulatorArm64Main.dependsOn(this)
-        }
-        val iosTest by getting
-        val iosX64Test by getting {
-            dependsOn(iosTest)
-        }
-        val iosArm64Test by getting {
-            dependsOn(iosTest)
-        }
-        val iosSimulatorArm64Test by getting {
-            dependsOn(iosTest)
-        }
     }
 }
 
@@ -87,7 +65,7 @@ android {
 
     defaultConfig {
         minSdk = (findProperty("android.minSdk") as String).toInt()
-        targetSdk = (findProperty("android.targetSdk") as String).toInt()
+        lint.targetSdk = (findProperty("android.targetSdk") as String).toInt()
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11

diff --git a/shared/src/commonMain/kotlin/xyz/alaniz/aaron/lightsaber/App.kt b/shared/src/commonMain/kotlin/xyz/alaniz/aaron/lightsaber/App.kt
@@ -16,7 +16,7 @@ import xyz.alaniz.aaron.lightsaber.di.ApplicationComponent
 @Composable
 fun App(initialScreen: Screen, createAppComponent: (CoroutineScope, Navigator) -> ApplicationComponent) {
     val scope = rememberCoroutineScope()
-    val backstack = rememberSaveableBackStack { push(initialScreen) }
+    val backstack = rememberSaveableBackStack(root = initialScreen)
     val navigator = rememberCircuitNavigator(backstack) {
         /**
          * TODO handle root pops
@@ -26,7 +26,7 @@ fun App(initialScreen: Screen, createAppComponent: (CoroutineScope, Navigator) -
 
     CircuitCompositionLocals(appComponent.circuit) {
         NavigableCircuitContent(
-            navigator = navigator, backstack = backstack, decoration = GestureNavigationDecoration {
+            navigator = navigator, backStack = backstack, decoration = GestureNavigationDecoration {
                 navigator::pop
             }
         )