Migrate all libraries to version catalog and bump libraries (#403)

Author: newmskywalker

android/app-newm/build.gradle.kts

@@ -8,12 +8,12 @@ apply(from = "../../gradle_include/circuit.gradle")
 apply(from = "../../gradle_include/flipper.gradle")
 
 plugins {
-    id("com.android.application")
-    id("com.google.gms.google-services")
-    id("kotlin-parcelize")
-    kotlin("android")
-    kotlin("kapt")
-    id("io.sentry.android.gradle") version "5.12.1"
+    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.googleServices)
+    alias(libs.plugins.kotlin.plugin.parcelize)
+    alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.kotlinKapt)
+    alias(libs.plugins.sentry)
     alias(libs.plugins.compose.multiplatform)
 }
 
@@ -101,6 +101,8 @@ dependencies {
     implementation(libs.androidx.constraintlayout)
     implementation(libs.firebase.analytics)
     implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.kotlinx.collections.immutable)
+    implementation(libs.circuit.retained)
     implementation(compose.material)
     implementation(libs.androidx.media3.datasource)
     implementation(libs.androidx.media3.exoplayer)

android/app-newm/src/main/java/io/newm/HomeActivity.kt

@@ -11,7 +11,7 @@ import androidx.compose.runtime.getValue
 import com.slack.circuit.foundation.Circuit
 import com.slack.circuit.foundation.CircuitCompositionLocals
 import com.slack.circuit.retained.LocalRetainedStateRegistry
-import com.slack.circuit.retained.continuityRetainedStateRegistry
+import com.slack.circuit.retained.lifecycleRetainedStateRegistry
 import com.slack.circuit.runtime.presenter.Presenter
 import com.slack.circuit.runtime.ui.Ui
 import io.newm.core.theme.NewmTheme
@@ -296,7 +296,7 @@ class HomeActivity : ComponentActivity() {
     fun CircuitDependencies(content: @Composable () -> Unit) {
         CircuitCompositionLocals(circuit) {
             CompositionLocalProvider(
-                LocalRetainedStateRegistry provides continuityRetainedStateRegistry(),
+                LocalRetainedStateRegistry provides lifecycleRetainedStateRegistry(),
                 LocalIsBottomBarVisible provides isBottomBarVisible(),
             ) {
                 content()

android/app-newm/src/main/java/io/newm/LoginActivity.kt

@@ -23,7 +23,7 @@ import com.slack.circuit.foundation.CircuitCompositionLocals
 import com.slack.circuit.foundation.NavigableCircuitContent
 import com.slack.circuit.foundation.rememberCircuitNavigator
 import com.slack.circuit.retained.LocalRetainedStateRegistry
-import com.slack.circuit.retained.continuityRetainedStateRegistry
+import com.slack.circuit.retained.lifecycleRetainedStateRegistry
 import com.slack.circuit.runtime.presenter.Presenter
 import com.slack.circuit.runtime.ui.Ui
 import io.newm.core.theme.NewmTheme
@@ -180,7 +180,7 @@ class LoginActivity : ComponentActivity() {
     fun CircuitDependencies(content: @Composable () -> Unit) {
         CircuitCompositionLocals(circuit) {
             CompositionLocalProvider(
-                LocalRetainedStateRegistry provides continuityRetainedStateRegistry(),
+                LocalRetainedStateRegistry provides lifecycleRetainedStateRegistry(),
             ) {
                 content()
             }

android/app-newm/src/main/java/io/newm/NewmNavigator.kt

@@ -10,6 +10,7 @@ import io.newm.shared.NewmAppLogger
 import io.newm.shared.commonPublic.analytics.NewmAppEventLogger
 import io.newm.sharedfeatures.screens.HomeScreen
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 
 @Composable
 fun rememberNewmNavigator(
@@ -54,19 +55,18 @@ private class NewmNavigator(
     }
 
     override fun pop(result: PopResult?): Screen? {
-        val screen = circuitNavigator.pop()
+        val screen = circuitNavigator.pop(result)
         logger.debug(tag = "NewmNavigator", message = "Popping screen: $screen")
         return screen
     }
 
     override fun resetRoot(
         newRoot: Screen,
-        saveState: Boolean,
-        restoreState: Boolean,
+        options: Navigator.StateOptions,
     ): ImmutableList<Screen> {
         logger.debug(tag = "NewmNavigator", message = "Resetting root to $newRoot")
         logPageViewEvent(newRoot)
-        return circuitNavigator.resetRoot(newRoot)
+        return circuitNavigator.resetRoot(newRoot, options).toImmutableList()
     }
 
     private fun logPageViewEvent(screen: Screen) {

android/core/android/implementations/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.library")
-    kotlin("android")
+    alias(libs.plugins.androidLibrary)
+    alias(libs.plugins.kotlinAndroid)
 }
 
 android {

android/core/resources/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.library")
-    kotlin("android")
+    alias(libs.plugins.androidLibrary)
+    alias(libs.plugins.kotlinAndroid)
 }
 
 android {

android/core/test-utils/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.library")
-    kotlin("android")
+    alias(libs.plugins.androidLibrary)
+    alias(libs.plugins.kotlinAndroid)
 }
 
 apply(from = "../../../gradle_include/circuit.gradle")
@@ -21,10 +21,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-
-    kotlinOptions { jvmTarget = "11" }
 }
 
+kotlin { compilerOptions { jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } }
+
 dependencies {
     implementation(libs.paparazzi)
     implementation(project(Modules.CORE_THEME))

android/core/theme/build.gradle.kts

@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    id("com.android.library")
+    alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.compose.multiplatform)
 }

android/core/ui-utils/build.gradle.kts

@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    id("com.android.library")
+    alias(libs.plugins.androidLibrary)
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.compose.multiplatform)
     alias(libs.plugins.compose.compiler)

android/features/barcode-scanner/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.androidLibrary)
+    alias(libs.plugins.kotlinAndroid)
     alias(libs.plugins.compose.multiplatform)
 }