Update to Coil 1.0.0-rc3

Turned off -Xjvm-default=all as per Coil release notes, and started using new `imageLoader` extension property.
google · Sep 22, 2020 · c23db0c · c23db0c
1 parent e80eda0
commit c23db0c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -98,8 +98,6 @@ subprojects {
             freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
 
             freeCompilerArgs += "-Xallow-jvm-ir-dependencies"
-            // Turn on JVM default methods
-            freeCompilerArgs += "-Xjvm-default=all"
         }
     }
 

diff --git a/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt b/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt
@@ -86,7 +86,7 @@ object Libs {
         const val appcompat = "androidx.appcompat:appcompat:1.3.0-alpha02"
     }
 
-    const val coil = "io.coil-kt:coil:1.0.0-rc2"
+    const val coil = "io.coil-kt:coil:1.0.0-rc3"
 
     const val truth = "com.google.truth:truth:1.0.1"
     const val mockk = "io.mockk:mockk-android:1.10.0"

diff --git a/coil/src/main/java/dev/chrisbanes/accompanist/coil/Coil.kt b/coil/src/main/java/dev/chrisbanes/accompanist/coil/Coil.kt
@@ -44,6 +44,7 @@ import androidx.core.graphics.drawable.toBitmap
 import coil.Coil
 import coil.ImageLoader
 import coil.decode.DataSource
+import coil.imageLoader
 import coil.request.ImageRequest
 import coil.request.ImageResult
 
@@ -77,7 +78,7 @@ import coil.request.ImageResult
 fun CoilImage(
     data: Any,
     modifier: Modifier = Modifier,
-    imageLoader: ImageLoader = Coil.imageLoader(ContextAmbient.current),
+    imageLoader: ImageLoader = ContextAmbient.current.imageLoader,
     shouldRefetchOnSizeChange: (currentResult: CoilImageState, size: IntSize) -> Boolean = defaultRefetchOnSizeChangeLambda,
     onRequestCompleted: (CoilImageState) -> Unit = emptySuccessLambda,
     content: @Composable (imageState: CoilImageState) -> Unit
@@ -123,7 +124,7 @@ fun CoilImage(
 fun CoilImage(
     request: ImageRequest,
     modifier: Modifier = Modifier,
-    imageLoader: ImageLoader = Coil.imageLoader(ContextAmbient.current),
+    imageLoader: ImageLoader = ContextAmbient.current.imageLoader,
     shouldRefetchOnSizeChange: (currentResult: CoilImageState, size: IntSize) -> Boolean = defaultRefetchOnSizeChangeLambda,
     onRequestCompleted: (CoilImageState) -> Unit = emptySuccessLambda,
     content: @Composable (imageState: CoilImageState) -> Unit
@@ -231,7 +232,7 @@ fun CoilImage(
     contentScale: ContentScale = ContentScale.Fit,
     colorFilter: ColorFilter? = null,
     fadeIn: Boolean = false,
-    imageLoader: ImageLoader = Coil.imageLoader(ContextAmbient.current),
+    imageLoader: ImageLoader = ContextAmbient.current.imageLoader,
     shouldRefetchOnSizeChange: (currentResult: CoilImageState, size: IntSize) -> Boolean = defaultRefetchOnSizeChangeLambda,
     onRequestCompleted: (CoilImageState) -> Unit = emptySuccessLambda,
     error: @Composable ((CoilImageState.Error) -> Unit)? = null,
@@ -301,7 +302,7 @@ fun CoilImage(
     contentScale: ContentScale = ContentScale.Fit,
     colorFilter: ColorFilter? = null,
     fadeIn: Boolean = false,
-    imageLoader: ImageLoader = Coil.imageLoader(ContextAmbient.current),
+    imageLoader: ImageLoader = ContextAmbient.current.imageLoader,
     shouldRefetchOnSizeChange: (currentResult: CoilImageState, size: IntSize) -> Boolean = defaultRefetchOnSizeChangeLambda,
     onRequestCompleted: (CoilImageState) -> Unit = emptySuccessLambda,
     error: @Composable ((CoilImageState.Error) -> Unit)? = null,

diff --git a/coil/src/main/java/dev/chrisbanes/accompanist/coil/Crossfade.kt b/coil/src/main/java/dev/chrisbanes/accompanist/coil/Crossfade.kt
@@ -50,9 +50,9 @@ import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.toSize
 import androidx.core.util.Pools
-import coil.Coil
 import coil.ImageLoader
 import coil.decode.DataSource
+import coil.imageLoader
 import coil.request.ImageRequest
 
 private const val DefaultTransitionDuration = 1000
@@ -87,7 +87,7 @@ fun CoilImageWithCrossfade(
     alignment: Alignment = Alignment.Center,
     contentScale: ContentScale = ContentScale.Fit,
     crossfadeDuration: Int = DefaultTransitionDuration,
-    imageLoader: ImageLoader = Coil.imageLoader(ContextAmbient.current),
+    imageLoader: ImageLoader = ContextAmbient.current.imageLoader,
     shouldRefetchOnSizeChange: (currentResult: CoilImageState, size: IntSize) -> Boolean = defaultRefetchOnSizeChangeLambda,
     onRequestCompleted: (CoilImageState) -> Unit = emptySuccessLambda,
     error: @Composable ((CoilImageState.Error) -> Unit)? = null,
@@ -138,7 +138,7 @@ fun CoilImageWithCrossfade(
     alignment: Alignment = Alignment.Center,
     contentScale: ContentScale = ContentScale.Fit,
     crossfadeDuration: Int = DefaultTransitionDuration,
-    imageLoader: ImageLoader = Coil.imageLoader(ContextAmbient.current),
+    imageLoader: ImageLoader = ContextAmbient.current.imageLoader,
     shouldRefetchOnSizeChange: (currentResult: CoilImageState, size: IntSize) -> Boolean = defaultRefetchOnSizeChangeLambda,
     onRequestCompleted: (CoilImageState) -> Unit = emptySuccessLambda,
     error: @Composable ((CoilImageState.Error) -> Unit)? = null,