Update to Coroutines 1.6.4

Author: thatfiredev

build.gradle

@@ -17,9 +17,7 @@ import com.google.firebase.gradle.MultiProjectReleasePlugin
 
 buildscript {
     ext.kotlinVersion = '1.7.10'
-    // Please update $coroutinesVersion alongside $kotlinVersion
-    // A map of versions can be found here: https://kotlinlang.org/docs/releases.html
-    ext.coroutinesVersion = '1.5.2'
+    ext.coroutinesVersion = '1.6.4'
 
     repositories {
         google()

firebase-common/ktx/src/test/kotlin/com/google/firebase/ktx/Tests.kt

@@ -20,8 +20,8 @@ import com.google.common.truth.Truth.assertThat
 import com.google.firebase.FirebaseApp
 import com.google.firebase.FirebaseOptions
 import com.google.firebase.platforminfo.UserAgentPublisher
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.tasks.await
+import kotlinx.coroutines.test.runTest
 import org.junit.Assert.fail
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -108,13 +108,12 @@ class KtxTests {
     }
 }
 
-// TODO(thatfiredev): replace runBlocking() with runTest() once we update kotlin to version >= 1.6
 class CoroutinesPlayServicesTests {
     // We are only interested in the await() function offered by kotlinx-coroutines-play-services
     // So we're not testing the other functions provided by that library.
 
     @Test
-    fun `Task#await() resolves to the same result as Task#getResult()`() = runBlocking {
+    fun `Task#await() resolves to the same result as Task#getResult()`() = runTest {
         val task = Tasks.forResult(21)
 
         val expected = task.result
@@ -126,7 +125,7 @@ class CoroutinesPlayServicesTests {
     }
 
     @Test
-    fun `Task#await() throws an Exception for failing Tasks`() = runBlocking {
+    fun `Task#await() throws an Exception for failing Tasks`() = runTest {
         val task = Tasks.forException<TestException>(TestException("some error happened"))
 
         try {
@@ -137,6 +136,4 @@ class CoroutinesPlayServicesTests {
             assertThat(task.isSuccessful).isFalse()
         }
     }
-
-    // TODO(thatfiredev): add a test for CancellationToken once we support Coroutines >= 1.6
 }

firebase-firestore/ktx/ktx.gradle

@@ -57,7 +57,7 @@ dependencies {
     implementation project(':firebase-common:ktx')
     implementation project(':firebase-firestore')
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
     implementation 'com.google.android.gms:play-services-basement:18.1.0'
     testImplementation project(':firebase-database-collection')
     testImplementation 'org.mockito:mockito-core:2.25.0'