From c62c8c9f9307dd1b770dcc0794ef9af55c9df560 Mon Sep 17 00:00:00 2001
From: Chris <chris@banes.me>
Date: Thu, 20 Aug 2020 10:56:53 +0100
Subject: [PATCH] Update to Coil v1.0.0-rc1

Also fixed the logic for detecting whether a custom
SizeResolver has been set. Thanks for the
hint @colinrtwhite
---
 build.gradle                                                | 2 ++
 .../dev/chrisbanes/accompanist/buildsrc/dependencies.kt     | 2 +-
 coil/src/main/java/dev/chrisbanes/accompanist/coil/Coil.kt  | 6 ++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index d2c974758..542df1280 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,6 +79,8 @@ 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
index f982e7ad5..37fefc30d 100644
--- a/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt
+++ b/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt
@@ -71,7 +71,7 @@ object Libs {
         const val appcompat = "androidx.appcompat:appcompat:1.3.0-alpha02"
     }
 
-    const val coil = "io.coil-kt:coil:0.12.0"
+    const val coil = "io.coil-kt:coil:1.0.0-rc1"
 
     const val truth = "com.google.truth:truth:1.0.1"
 }
diff --git a/coil/src/main/java/dev/chrisbanes/accompanist/coil/Coil.kt b/coil/src/main/java/dev/chrisbanes/accompanist/coil/Coil.kt
index 9a45aa89c..a14915bbd 100644
--- a/coil/src/main/java/dev/chrisbanes/accompanist/coil/Coil.kt
+++ b/coil/src/main/java/dev/chrisbanes/accompanist/coil/Coil.kt
@@ -44,7 +44,6 @@ import coil.Coil
 import coil.decode.DataSource
 import coil.request.ImageRequest
 import coil.request.ImageResult
-import coil.size.DisplaySizeResolver
 
 /**
  * Creates a composable that will attempt to load the given [data] using [Coil], and then
@@ -235,9 +234,8 @@ private fun CoilRequestActor(
     request: ImageRequest
 ) = RequestActor<IntSize, RequestResult?> { size ->
     when {
-        request.sizeResolver !is DisplaySizeResolver -> {
-            // If the request doesn't have a default DisplaySizeResolver set, it must have a real
-            // size resolver, so we just execute the request as-is
+        request.defined.sizeResolver != null -> {
+            // If the request has a size resolver set we just execute the request as-is
             request
         }
         size.width == UNSPECIFIED || size.height == UNSPECIFIED -> {