diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskScreen.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskScreen.kt index 26e381546..0c4cfccf5 100644 --- a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskScreen.kt +++ b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskScreen.kt @@ -46,14 +46,12 @@ 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.google.accompanist.swiperefresh.SwipeRefresh import com.google.accompanist.swiperefresh.rememberSwipeRefreshState -@OptIn(ExperimentalLifecycleComposeApi::class) @Composable fun AddEditTaskScreen( @StringRes topBarTitle: Int, diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsScreen.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsScreen.kt index cd5b24d71..c04595aa1 100644 --- a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsScreen.kt +++ b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsScreen.kt @@ -34,14 +34,12 @@ 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.google.accompanist.appcompattheme.AppCompatTheme -@OptIn(ExperimentalLifecycleComposeApi::class) @Composable fun StatisticsScreen( openDrawer: () -> Unit, diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailScreen.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailScreen.kt index 814377da3..99e3ca8db 100644 --- a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailScreen.kt +++ b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailScreen.kt @@ -42,7 +42,6 @@ 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 @@ -50,7 +49,6 @@ import com.example.android.architecture.blueprints.todoapp.util.LoadingContent import com.example.android.architecture.blueprints.todoapp.util.TaskDetailTopAppBar import com.google.accompanist.appcompattheme.AppCompatTheme -@OptIn(ExperimentalLifecycleComposeApi::class) @Composable fun TaskDetailScreen( onEditTask: (String) -> Unit, diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreen.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreen.kt index 16cf81e86..0c1041e35 100644 --- a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreen.kt +++ b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksScreen.kt @@ -53,7 +53,6 @@ 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 @@ -64,7 +63,6 @@ import com.example.android.architecture.blueprints.todoapp.util.LoadingContent import com.example.android.architecture.blueprints.todoapp.util.TasksTopAppBar import com.google.accompanist.appcompattheme.AppCompatTheme -@OptIn(ExperimentalLifecycleComposeApi::class) @Composable fun TasksScreen( @StringRes userMessage: Int, @@ -165,7 +163,9 @@ private fun TasksContent( TaskItem( task = task, onTaskClick = onTaskClick, - onCheckedChange = { onTaskCheckedChange(task, it) } + onCheckedChange = { + onTaskCheckedChange(task, it) + } ) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c7415dcf8..9ff6299d5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,49 +1,49 @@ [versions] -accompanist = "0.28.0" -annotation = "1.5.0" -androidDesugarJdkLibs = "1.2.2" +accompanist = "0.30.1" +annotation = "1.6.0" +androidDesugarJdkLibs = "2.0.3" androidGradlePlugin = "7.4.0" -androidxActivity = "1.6.1" -androidxAppCompat = "1.5.1" -androidxArchCore = "2.1.0" +androidxActivity = "1.7.2" +androidxAppCompat = "1.6.1" +androidxArchCore = "2.2.0" androidxBrowser = "1.4.0" -androidxComposeBom = "2023.01.00" +androidxComposeBom = "2023.06.01" androidxComposeCompiler = "1.4.3" androidxCompose = "1.2.0" -androidxComposeRuntimeTracing = "1.0.0-alpha01" -androidxCore = "1.9.0" -androidxCoreSplashscreen = "1.0.0" +androidxComposeRuntimeTracing = "1.0.0-alpha03" +androidxCore = "1.10.1" +androidxCoreSplashscreen = "1.0.1" androidxDataStore = "1.0.0" -androidxEspresso = "3.5.0" +androidxEspresso = "3.5.1" androidxHiltNavigationCompose = "1.0.0" -androidxLifecycle = "2.6.0-alpha03" +androidxLifecycle = "2.6.1" androidxMacroBenchmark = "1.1.1" -androidxMetrics = "1.0.0-alpha03" -androidxNavigation = "2.5.3" -androidxProfileinstaller = "1.2.1" +androidxMetrics = "1.0.0-alpha04" +androidxNavigation = "2.6.0" +androidxProfileinstaller = "1.3.1" androidxStartup = "1.1.1" androidxTestCore = "1.5.0" -androidxTestExt = "1.1.4" +androidxTestExt = "1.1.5" androidxTestRules = "1.5.0" -androidxTestRunner = "1.5.1" +androidxTestRunner = "1.5.2" androidxTracing = "1.1.0" androidxUiAutomator = "2.2.0" -androidxWindowManager = "1.0.0" -androidxWork = "2.7.1" -coil = "2.2.2" +androidxWindowManager = "1.1.0" +androidxWork = "2.8.1" +coil = "2.4.0" # @keep compileSdk = "33" hamcrest = "1.3" -hilt = "2.44.2" +hilt = "2.46.1" hiltExt = "1.0.0" jacoco = "0.8.7" junit4 = "4.13.2" kotlin = "1.8.10" -kotlinxCoroutines = "1.6.4" +kotlinxCoroutines = "1.7.1" kotlinxDatetime = "0.4.0" -kotlinxSerializationJson = "1.5.0" +kotlinxSerializationJson = "1.5.1" ksp = "1.8.10-1.0.9" -lint = "30.3.1" +lint = "31.0.2" # @keep minSdk = "21" okhttp = "4.10.0" @@ -56,7 +56,7 @@ spotless = "5.12.5" timber = "5.0.1" # @keep targetSdk = "33" -truth = "1.1.2" +truth = "1.1.3" turbine = "0.12.1" [libraries]