Merge pull request #820 from android/av/update-dependencies

alexvanyo · web-flow · commit 99b9bbf76d83 · 2022-03-02T08:53:59.000-08:00
Update dependencies
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,6 +21,7 @@ android {
             String sharedTestDir = 'src/sharedTest/java'
             test {
                 java.srcDirs += sharedTestDir
+                resources.srcDirs += 'src/sharedTest/resources'
             }
             androidTest {
                 java.srcDirs += sharedTestDir
@@ -148,7 +149,7 @@ dependencies {
     // Once https://issuetracker.google.com/127986458 is fixed this can be testImplementation
     debugImplementation "androidx.fragment:fragment-testing:$fragmentVersion"
     implementation "androidx.test:core:$androidXTestCoreVersion"
-    implementation "androidx.fragment:fragment:$fragmentVersion"
+    implementation "androidx.fragment:fragment-ktx:$fragmentVersion"
 
     // AndroidX Test - Instrumented testing
     androidTestImplementation "androidx.test:core-ktx:$androidXTestCoreVersion"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -28,6 +28,7 @@
         <activity
             android:name="com.example.android.architecture.blueprints.todoapp.tasks.TasksActivity"
             android:windowSoftInputMode="adjustResize"
+            android:exported="true"
             android:theme="@style/AppTheme.OverlapSystemBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskFragment.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/addedittask/AddEditTaskFragment.kt
@@ -70,10 +70,13 @@ class AddEditTaskFragment : Fragment() {
     }
 
     private fun setupNavigation() {
-        viewModel.taskUpdatedEvent.observe(viewLifecycleOwner, EventObserver {
-            val action = AddEditTaskFragmentDirections
-                .actionAddEditTaskFragmentToTasksFragment(ADD_EDIT_RESULT_OK)
-            findNavController().navigate(action)
-        })
+        viewModel.taskUpdatedEvent.observe(
+            viewLifecycleOwner,
+            EventObserver {
+                val action = AddEditTaskFragmentDirections
+                    .actionAddEditTaskFragmentToTasksFragment(ADD_EDIT_RESULT_OK)
+                findNavController().navigate(action)
+            }
+        )
     }
 }
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsViewModel.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/statistics/StatisticsViewModel.kt
@@ -46,7 +46,8 @@ class StatisticsViewModel(
     }
 
     val activeTasksPercent = stats.map {
-        it?.activeTasksPercent ?: 0f }
+        it?.activeTasksPercent ?: 0f
+    }
     val completedTasksPercent: LiveData<Float> = stats.map { it?.completedTasksPercent ?: 0f }
     val dataLoading: LiveData<Boolean> = _dataLoading
     val error: LiveData<Boolean> = tasks.map { it is Error }
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailFragment.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailFragment.kt
@@ -48,25 +48,31 @@ class TaskDetailFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupFab()
-        view?.setupSnackbar(this, viewModel.snackbarText, Snackbar.LENGTH_SHORT)
+        view.setupSnackbar(this, viewModel.snackbarText, Snackbar.LENGTH_SHORT)
         setupNavigation()
         this.setupRefreshLayout(viewDataBinding.refreshLayout)
     }
 
     private fun setupNavigation() {
-        viewModel.deleteTaskEvent.observe(this, EventObserver {
-            val action = TaskDetailFragmentDirections
-                .actionTaskDetailFragmentToTasksFragment(DELETE_RESULT_OK)
-            findNavController().navigate(action)
-        })
-        viewModel.editTaskEvent.observe(this, EventObserver {
-            val action = TaskDetailFragmentDirections
-                .actionTaskDetailFragmentToAddEditTaskFragment(
-                    args.taskId,
-                    resources.getString(R.string.edit_task)
-                )
-            findNavController().navigate(action)
-        })
+        viewModel.deleteTaskEvent.observe(
+            this,
+            EventObserver {
+                val action = TaskDetailFragmentDirections
+                    .actionTaskDetailFragmentToTasksFragment(DELETE_RESULT_OK)
+                findNavController().navigate(action)
+            }
+        )
+        viewModel.editTaskEvent.observe(
+            this,
+            EventObserver {
+                val action = TaskDetailFragmentDirections
+                    .actionTaskDetailFragmentToAddEditTaskFragment(
+                        args.taskId,
+                        resources.getString(R.string.edit_task)
+                    )
+                findNavController().navigate(action)
+            }
+        )
     }
 
     private fun setupFab() {
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksFragment.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksFragment.kt
@@ -98,12 +98,18 @@ class TasksFragment : Fragment() {
     }
 
     private fun setupNavigation() {
-        viewModel.openTaskEvent.observe(viewLifecycleOwner, EventObserver {
-            openTaskDetails(it)
-        })
-        viewModel.newTaskEvent.observe(viewLifecycleOwner, EventObserver {
-            navigateToAddNewTask()
-        })
+        viewModel.openTaskEvent.observe(
+            viewLifecycleOwner,
+            EventObserver {
+                openTaskDetails(it)
+            }
+        )
+        viewModel.newTaskEvent.observe(
+            viewLifecycleOwner,
+            EventObserver {
+                navigateToAddNewTask()
+            }
+        )
     }
 
     private fun setupSnackbar() {
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksViewModel.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/tasks/TasksViewModel.kt
@@ -232,7 +232,7 @@ class TasksViewModel(
             }
         }
         return tasksToShow
-        }
+    }
 
     fun refresh() {
         _forceUpdate.value = true
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/SimpleCountingIdlingResource.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/SimpleCountingIdlingResource.kt
@@ -16,7 +16,6 @@
 package com.example.android.architecture.blueprints.todoapp.util
 
 import androidx.test.espresso.IdlingResource
-
 import java.util.concurrent.atomic.AtomicInteger
 
 /**
diff --git a/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/ViewExt.kt b/app/src/main/java/com/example/android/architecture/blueprints/todoapp/util/ViewExt.kt
@@ -57,11 +57,14 @@ fun View.setupSnackbar(
     timeLength: Int
 ) {
 
-    snackbarEvent.observe(lifecycleOwner, Observer { event ->
-        event.getContentIfNotHandled()?.let {
-            showSnackbar(context.getString(it), timeLength)
+    snackbarEvent.observe(
+        lifecycleOwner,
+        Observer { event ->
+            event.getContentIfNotHandled()?.let {
+                showSnackbar(context.getString(it), timeLength)
+            }
         }
-    })
+    )
 }
 
 fun Fragment.setupRefreshLayout(
diff --git a/app/src/sharedTest/java/com/example/android/architecture/blueprints/todoapp/data/source/local/TasksLocalDataSourceTest.kt b/app/src/sharedTest/java/com/example/android/architecture/blueprints/todoapp/data/source/local/TasksLocalDataSourceTest.kt
@@ -29,8 +29,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
 import org.hamcrest.CoreMatchers.`is`
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.After
-import org.junit.Assert.assertThat
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
diff --git a/app/src/sharedTest/resources/robolectric.properties b/app/src/sharedTest/resources/robolectric.properties
@@ -0,0 +1 @@
+sdk=31
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 buildscript {
-    ext.kotlinVersion = '1.5.10'
-    ext.navigationVersion = '2.3.5'
-    ext.ktlintVersion = '0.33.0'
+    ext.kotlinVersion = '1.6.10'
+    ext.navigationVersion = '2.4.1'
+    ext.ktlintVersion = '0.44.0'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigationVersion"
 
@@ -23,7 +23,7 @@ plugins {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     apply plugin: 'com.diffplug.spotless'
     spotless {
@@ -39,32 +39,32 @@ allprojects {
 ext {
     // Sdk and tools
     minSdkVersion = 21
-    targetSdkVersion = 30
-    compileSdkVersion = 30
+    targetSdkVersion = 32
+    compileSdkVersion = 32
 
     // App dependencies
     androidXVersion = '1.0.0'
-    androidXTestCoreVersion = '1.3.0'
-    androidXTestExtKotlinRunnerVersion = '1.1.2'
+    androidXTestCoreVersion = '1.4.0'
+    androidXTestExtKotlinRunnerVersion = '1.1.3'
     androidXTestRulesVersion = '1.2.0'
-    androidXAnnotations = '1.2.0'
+    androidXAnnotations = '1.3.0'
     androidXLegacySupport = '1.0.0'
-    appCompatVersion = '1.3.0'
-    archLifecycleVersion = '2.3.1'
+    appCompatVersion = '1.4.1'
+    archLifecycleVersion = '2.4.1'
     archTestingVersion = '2.1.0'
     cardVersion = '1.0.0'
-    coroutinesVersion = '1.5.0'
+    coroutinesVersion = '1.5.2'
     dexMakerVersion = '2.12.1'
-    espressoVersion = '3.3.0'
-    fragmentVersion = '1.3.4'
-    fragmentKtxVersion = '1.3.4'
+    espressoVersion = '3.5.0-alpha04'
+    fragmentVersion = '1.4.1'
+    fragmentKtxVersion = '1.4.1'
     hamcrestVersion = '1.3'
-    junitVersion = '4.13.1'
-    materialVersion = '1.3.0'
+    junitVersion = '4.13.2'
+    materialVersion = '1.5.0'
     multiDexVersion = '2.0.1'
-    recyclerViewVersion = '1.2.0'
-    robolectricVersion = '4.5.1'
-    roomVersion = '2.3.0'
+    recyclerViewVersion = '1.2.1'
+    robolectricVersion = '4.7.3'
+    roomVersion = '2.4.1'
     rulesVersion = '1.0.1'
     timberVersion = '4.7.1'
     truthVersion = '1.1.2'
diff --git a/gradle.properties b/gradle.properties
@@ -18,5 +18,4 @@
 # org.gradle.parallel=true
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableR8=true
 kapt.incremental.apt=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 01 08:01:38 UTC 2021
+#Fri Feb 18 13:22:47 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,13 @@ class AddEditTaskFragment : Fragment() {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`private fun setupNavigation() {`
`73`		`- viewModel.taskUpdatedEvent.observe(viewLifecycleOwner, EventObserver {`
`74`		`- val action = AddEditTaskFragmentDirections`
`75`		`- .actionAddEditTaskFragmentToTasksFragment(ADD_EDIT_RESULT_OK)`
`76`		`- findNavController().navigate(action)`
`77`		`- })`
	`73`	`+ viewModel.taskUpdatedEvent.observe(`
	`74`	`+ viewLifecycleOwner,`
	`75`	`+ EventObserver {`
	`76`	`+ val action = AddEditTaskFragmentDirections`
	`77`	`+ .actionAddEditTaskFragmentToTasksFragment(ADD_EDIT_RESULT_OK)`
	`78`	`+ findNavController().navigate(action)`
	`79`	`+ }`
	`80`	`+ )`
`78`	`81`	`}`
`79`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ class StatisticsViewModel(`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`val activeTasksPercent = stats.map {`
`49`		`- it?.activeTasksPercent ?: 0f }`
	`49`	`+ it?.activeTasksPercent ?: 0f`
	`50`	`+ }`
`50`	`51`	`val completedTasksPercent: LiveData<Float> = stats.map { it?.completedTasksPercent ?: 0f }`
`51`	`52`	`val dataLoading: LiveData<Boolean> = _dataLoading`
`52`	`53`	`val error: LiveData<Boolean> = tasks.map { it is Error }`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ class TasksViewModel(`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`	`return tasksToShow`
`235`		`- }`
	`235`	`+ }`
`236`	`236`
`237`	`237`	`fun refresh() {`
`238`	`238`	`_forceUpdate.value = true`