Update Coroutines to 1.7.1. (#1757)

* Bump coroutines from 1.6.4 to 1.7.1 Bumps `coroutines` from 1.6.4 to 1.7.1. Updates `org.jetbrains.kotlinx:kotlinx-coroutines-android` from 1.6.4 to 1.7.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](Kotlin/kotlinx.coroutines@1.6.4...1.7.1) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-test` from 1.6.4 to 1.7.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](Kotlin/kotlinx.coroutines@1.6.4...1.7.1) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update Coroutines to 1.7.1. * Use better value. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
coil-kt · May 18, 2023 · c04bc43 · c04bc43
1 parent 264e4e7
commit c04bc43
Show file tree

Hide file tree

Showing 21 changed files with 3 additions and 44 deletions.
diff --git a/coil-base/src/androidTest/java/coil/EventListenerTest.kt b/coil-base/src/androidTest/java/coil/EventListenerTest.kt
@@ -25,14 +25,12 @@ import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.test.assertTrue
 import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class EventListenerTest {
 
     private lateinit var context: Context

diff --git a/coil-base/src/androidTest/java/coil/decode/BitmapFactoryDecoderTest.kt b/coil-base/src/androidTest/java/coil/decode/BitmapFactoryDecoderTest.kt
@@ -22,14 +22,12 @@ import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
 import kotlin.test.assertIs
 import kotlin.test.assertTrue
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import okio.buffer
 import okio.source
 import org.junit.Before
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class BitmapFactoryDecoderTest {
 
     private lateinit var context: Context

diff --git a/coil-base/src/androidTest/java/coil/fetch/AssetUriFetcherTest.kt b/coil-base/src/androidTest/java/coil/fetch/AssetUriFetcherTest.kt
@@ -12,12 +12,10 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class AssetUriFetcherTest {
 
     private lateinit var context: Context

diff --git a/coil-base/src/androidTest/java/coil/fetch/ContentUriFetcherTest.kt b/coil-base/src/androidTest/java/coil/fetch/ContentUriFetcherTest.kt
@@ -26,7 +26,6 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertIs
 import kotlin.test.assertTrue
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import okio.buffer
 import okio.sink
@@ -35,7 +34,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class ContentUriFetcherTest {
 
     private lateinit var context: Context

diff --git a/coil-base/src/androidTest/java/coil/fetch/FileFetcherTest.kt b/coil-base/src/androidTest/java/coil/fetch/FileFetcherTest.kt
@@ -9,12 +9,10 @@ import coil.util.copyAssetToFile
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class FileFetcherTest {
 
     private lateinit var context: Context

diff --git a/coil-base/src/androidTest/java/coil/fetch/ResourceUriFetcherTest.kt b/coil-base/src/androidTest/java/coil/fetch/ResourceUriFetcherTest.kt
@@ -22,13 +22,11 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class ResourceUriFetcherTest {
 
     private lateinit var context: Context

diff --git a/coil-base/src/androidTest/java/coil/transform/CircleCropTransformationTest.kt b/coil-base/src/androidTest/java/coil/transform/CircleCropTransformationTest.kt
@@ -5,12 +5,10 @@ import androidx.test.core.app.ApplicationProvider
 import coil.size.Size
 import coil.util.assertIsSimilarTo
 import coil.util.decodeBitmapAsset
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class CircleCropTransformationTest {
 
     private lateinit var context: Context

diff --git a/coil-base/src/androidTest/java/coil/transform/RoundedCornerTransformationTest.kt b/coil-base/src/androidTest/java/coil/transform/RoundedCornerTransformationTest.kt
@@ -9,12 +9,10 @@ import coil.util.assertIsSimilarTo
 import coil.util.decodeBitmapAsset
 import coil.util.size
 import kotlin.test.assertEquals
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class RoundedCornerTransformationTest {
 
     private lateinit var context: Context

diff --git a/coil-base/src/test/java/coil/intercept/EngineInterceptorTest.kt b/coil-base/src/test/java/coil/intercept/EngineInterceptorTest.kt
@@ -21,14 +21,12 @@ import coil.util.size
 import kotlin.test.assertEquals
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
-@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(RobolectricTestRunner::class)
 class EngineInterceptorTest {
 

diff --git a/coil-base/src/test/java/coil/intercept/RealInterceptorChainTest.kt b/coil-base/src/test/java/coil/intercept/RealInterceptorChainTest.kt
@@ -1,5 +1,3 @@
-@file:Suppress("NOTHING_TO_INLINE")
-
 package coil.intercept
 
 import android.content.Context
@@ -18,14 +16,12 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertNotEquals
 import kotlin.test.assertSame
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
-@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(RobolectricTestRunner::class)
 class RealInterceptorChainTest {
 

diff --git a/coil-base/src/test/java/coil/request/ImageRequestTest.kt b/coil-base/src/test/java/coil/request/ImageRequestTest.kt
@@ -21,14 +21,12 @@ import kotlin.test.assertNotSame
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
-@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(RobolectricTestRunner::class)
 class ImageRequestTest {
 

diff --git a/coil-base/src/test/java/coil/size/ViewSizeResolverTest.kt b/coil-base/src/test/java/coil/size/ViewSizeResolverTest.kt
@@ -9,7 +9,6 @@ import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.test.runTest
@@ -19,7 +18,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
-@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(RobolectricTestRunner::class)
 class ViewSizeResolverTest {
 

diff --git a/coil-base/src/test/java/coil/transition/CrossfadeTransitionTest.kt b/coil-base/src/test/java/coil/transition/CrossfadeTransitionTest.kt
@@ -14,14 +14,12 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 import kotlin.test.fail
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
-@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(RobolectricTestRunner::class)
 class CrossfadeTransitionTest {
 

diff --git a/coil-compose-base/src/androidTest/java/coil/compose/AsyncImagePainterTest.kt b/coil-compose-base/src/androidTest/java/coil/compose/AsyncImagePainterTest.kt
@@ -56,7 +56,6 @@ import java.util.concurrent.atomic.AtomicInteger
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.onCompletion
@@ -68,7 +67,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class AsyncImagePainterTest {
 
     @get:Rule

diff --git a/coil-gif/src/androidTest/java/coil/transform/AnimatedAndNormalTransformationTest.kt b/coil-gif/src/androidTest/java/coil/transform/AnimatedAndNormalTransformationTest.kt
@@ -26,12 +26,10 @@ import coil.util.assertIsSimilarTo
 import coil.util.decodeBitmapAsset
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class AnimatedAndNormalTransformationTest {
 
     private lateinit var context: Context

diff --git a/coil-gif/src/androidTest/java/coil/transform/AnimatedTransformationTest.kt b/coil-gif/src/androidTest/java/coil/transform/AnimatedTransformationTest.kt
@@ -16,12 +16,10 @@ import coil.util.assertIsSimilarTo
 import coil.util.assumeTrue
 import coil.util.decodeBitmapAsset
 import kotlin.test.assertTrue
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class AnimatedTransformationTest {
 
     private lateinit var context: Context

diff --git a/coil-gif/src/androidTest/java/coil/transform/AnimationCallbacksTest.kt b/coil-gif/src/androidTest/java/coil/transform/AnimationCallbacksTest.kt
@@ -17,7 +17,7 @@ import coil.request.onAnimationStart
 import coil.request.repeatCount
 import coil.util.ViewTestActivity
 import coil.util.activity
-import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
@@ -26,7 +26,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class AnimationCallbacksTest {
 
     private lateinit var context: Context
@@ -52,7 +51,7 @@ class AnimationCallbacksTest {
     }
 
     @Test
-    fun callbacksTest() = runTest(dispatchTimeoutMs = 30_000) {
+    fun callbacksTest() = runTest(timeout = 30.seconds) {
         val imageView = activityRule.scenario.activity.imageView
         val isStartCalled = MutableStateFlow(false)
         val isEndCalled = MutableStateFlow(false)

diff --git a/coil-svg/src/androidTest/java/coil/decode/SvgDecoderTest.kt b/coil-svg/src/androidTest/java/coil/decode/SvgDecoderTest.kt
@@ -17,7 +17,6 @@ import kotlin.test.assertIs
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import okio.Buffer
 import okio.BufferedSource
@@ -26,7 +25,6 @@ import okio.source
 import org.junit.Before
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class SvgDecoderTest {
 
     private lateinit var context: Context

diff --git a/coil-test/src/test/java/coil/test/FakeImageLoaderEngineTest.kt b/coil-test/src/test/java/coil/test/FakeImageLoaderEngineTest.kt
@@ -11,13 +11,11 @@ import coil.request.SuccessResult
 import coil.test.FakeImageLoaderEngine.OptionalInterceptor
 import kotlin.test.assertIs
 import kotlin.test.assertSame
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 
-@OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(RobolectricTestRunner::class)
 class FakeImageLoaderEngineTest {
 

diff --git a/coil-video/src/androidTest/java/coil/decode/VideoFrameDecoderTest.kt b/coil-video/src/androidTest/java/coil/decode/VideoFrameDecoderTest.kt
@@ -15,14 +15,12 @@ import coil.util.decodeBitmapAsset
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import okio.buffer
 import okio.source
 import org.junit.Before
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class)
 class VideoFrameDecoderTest {
 
     private lateinit var context: Context

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ androidx-activity = "1.7.1"
 androidx-lifecycle = "2.6.1"
 compose = "1.4.3"
 composeCompiler = "1.4.7"
-coroutines = "1.6.4"
+coroutines = "1.7.1"
 ktlint = "0.48.2"
 okhttp = "4.11.0"
 okio = "3.3.0"