Update to use AndroidX collectAsStateWithLifecycle (#863)

Author: Manuel Vivo

app/build.gradle

@@ -81,7 +81,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "$composeVersion"
+        kotlinCompilerExtensionVersion "$composeCompilerVersion"
     }
 
     testOptions {
@@ -142,10 +142,12 @@ dependencies {
 
     // Jetpack Compose
     implementation "androidx.activity:activity-compose:$activityComposeVersion"
+    implementation "androidx.compose.compiler:compiler:$composeCompilerVersion"
     implementation "androidx.compose.material:material:$composeVersion"
     implementation "androidx.compose.animation:animation:$composeVersion"
     implementation "androidx.compose.ui:ui-tooling-preview:$composeVersion"
     implementation "androidx.navigation:navigation-compose:$navigationVersion"
+    implementation "androidx.lifecycle:lifecycle-runtime-compose:$archLifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$archLifecycleVersion"
     implementation "com.google.accompanist:accompanist-appcompat-theme:$accompanistVersion"
     implementation "com.google.accompanist:accompanist-swiperefresh:$accompanistVersion"

app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskScreen.kt

@@ -45,12 +45,14 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.example.android.architecture.blueprints.todoapp.R
 import com.example.android.architecture.blueprints.todoapp.util.AddEditTaskTopAppBar
-import com.example.android.architecture.blueprints.todoapp.util.collectAsStateWithLifecycle
 import com.google.accompanist.swiperefresh.SwipeRefresh
 import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
 
+@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun AddEditTaskScreen(
     @StringRes topBarTitle: Int,

app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsScreen.kt

@@ -33,12 +33,14 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.example.android.architecture.blueprints.todoapp.R
 import com.example.android.architecture.blueprints.todoapp.util.LoadingContent
 import com.example.android.architecture.blueprints.todoapp.util.StatisticsTopAppBar
-import com.example.android.architecture.blueprints.todoapp.util.collectAsStateWithLifecycle
 import com.google.accompanist.appcompattheme.AppCompatTheme
 
+@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun StatisticsScreen(
     openDrawer: () -> Unit,
@@ -95,7 +97,12 @@ private fun StatisticsContent(
         ) {
             if (!loading) {
                 Text(stringResource(id = R.string.statistics_active_tasks, activeTasksPercent))
-                Text(stringResource(id = R.string.statistics_completed_tasks, completedTasksPercent))
+                Text(
+                    stringResource(
+                        id = R.string.statistics_completed_tasks,
+                        completedTasksPercent
+                    )
+                )
             }
         }
     }

app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailScreen.kt

@@ -41,13 +41,15 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.example.android.architecture.blueprints.todoapp.R
 import com.example.android.architecture.blueprints.todoapp.data.Task
 import com.example.android.architecture.blueprints.todoapp.util.LoadingContent
 import com.example.android.architecture.blueprints.todoapp.util.TaskDetailTopAppBar
-import com.example.android.architecture.blueprints.todoapp.util.collectAsStateWithLifecycle
 import com.google.accompanist.appcompattheme.AppCompatTheme
 
+@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun TaskDetailScreen(
     onEditTask: (String) -> Unit,

app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreen.kt

@@ -53,16 +53,18 @@ import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.example.android.architecture.blueprints.todoapp.R
 import com.example.android.architecture.blueprints.todoapp.data.Task
 import com.example.android.architecture.blueprints.todoapp.tasks.TasksFilterType.ACTIVE_TASKS
 import com.example.android.architecture.blueprints.todoapp.tasks.TasksFilterType.ALL_TASKS
 import com.example.android.architecture.blueprints.todoapp.tasks.TasksFilterType.COMPLETED_TASKS
 import com.example.android.architecture.blueprints.todoapp.util.LoadingContent
 import com.example.android.architecture.blueprints.todoapp.util.TasksTopAppBar
-import com.example.android.architecture.blueprints.todoapp.util.collectAsStateWithLifecycle
 import com.google.accompanist.appcompattheme.AppCompatTheme
 
+@OptIn(ExperimentalLifecycleComposeApi::class)
 @Composable
 fun TasksScreen(
     @StringRes userMessage: Int,

app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/CollectAsStateWithLifecycle.kt

@@ -1,6 +1,6 @@
 buildscript {
-    ext.kotlinVersion = '1.6.10'
-    ext.navigationVersion = '2.4.2'
+    ext.kotlinVersion = '1.7.0'
+    ext.navigationVersion = '2.5.0'
     ext.ktlintVersion = '0.44.0'
     ext.hiltVersion = '2.42'
 
@@ -9,7 +9,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0-beta01'
+        classpath 'com.android.tools.build:gradle:7.3.0-beta05'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigationVersion"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hiltVersion"
@@ -62,9 +62,10 @@ ext {
     androidXTestExtKotlinRunnerVersion = '1.1.4-alpha06'
     androidXTestRulesVersion = '1.4.1-alpha06'
     androidXAnnotations = '1.3.0'
-    archLifecycleVersion = '2.5.0-rc01'
+    archLifecycleVersion = '2.6.0-alpha01'
     archTestingVersion = '2.1.0'
-    composeVersion = '1.1.1'
+    composeVersion = '1.2.0'
+    composeCompilerVersion = '1.2.0'
     coroutinesVersion = '1.6.1'
     dexMakerVersion = '2.12.1'
     espressoVersion = '3.5.0-alpha06'