From 554dddb02724bab49a076f60d5beeeba04337b43 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 22:14:48 +0000
Subject: [PATCH 1/3] fix(deps): update dependency
 org.jetbrains.compose:compose-gradle-plugin to v1.7.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 750f13573..b7d4e1587 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ androidx-lifecycle = "2.8.7"
 androidx-tracing-perfetto = "1.0.0"
 atomicfu = "0.26.0"
 coroutines = "1.9.0"
-jetbrains-compose = "1.6.11"
+jetbrains-compose = "1.7.0"
 kotlin = "2.0.21"
 ktlint = "1.3.1"
 ktor2 = "2.3.12"

From 7eaa2beeccc987057c78f778fbeb11338dbbfd3e Mon Sep 17 00:00:00 2001
From: Colin White <colin@colinwhite.me>
Date: Fri, 25 Oct 2024 15:18:39 -0700
Subject: [PATCH 2/3] Add extra changes.

# Conflicts:
#	gradle/libs.versions.toml
---
 build.gradle.kts                                         | 9 +++++++++
 gradle/libs.versions.toml                                | 2 +-
 .../kotlin/coil3/test/utils/AbstractSvgDecoderTest.kt    | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 516f10379..3bb730310 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -158,6 +158,15 @@ allprojects {
         }
     }
 
+    // https://youtrack.jetbrains.com/issue/CMP-5831
+    configurations.all {
+        resolutionStrategy.eachDependency {
+            if (requested.group == "org.jetbrains.kotlinx" && requested.name == "atomicfu") {
+                useVersion(libs.versions.atomicfu.get())
+            }
+        }
+    }
+
     applyOkioJsTestWorkaround()
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b7d4e1587..5e8e2d9e9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ okhttp = "4.12.0"
 okio = "3.9.1"
 paparazzi = "1.3.5"
 roborazzi = "1.32.2"
-skiko = "0.8.4"
+skiko = "0.8.15"
 
 [plugins]
 baselineProfile = { id = "androidx.baselineprofile", version.ref = "androidx-benchmark" }
diff --git a/internal/test-utils/src/jvmCommonMain/kotlin/coil3/test/utils/AbstractSvgDecoderTest.kt b/internal/test-utils/src/jvmCommonMain/kotlin/coil3/test/utils/AbstractSvgDecoderTest.kt
index b580c580d..bc6904ea0 100644
--- a/internal/test-utils/src/jvmCommonMain/kotlin/coil3/test/utils/AbstractSvgDecoderTest.kt
+++ b/internal/test-utils/src/jvmCommonMain/kotlin/coil3/test/utils/AbstractSvgDecoderTest.kt
@@ -108,7 +108,7 @@ abstract class AbstractSvgDecoderTest(
         assertTrue(result.isSampled)
 
         val expected = decodeBitmapResource("instacart_logo.png")
-        result.image.toBitmap().assertIsSimilarTo(expected)
+        result.image.toBitmap().assertIsSimilarTo(expected, threshold = 0.95)
     }
 
     /** Regression test: https://github.com/coil-kt/coil/issues/1246 */

From dbc2209108c773d22248921287534cea264c07f1 Mon Sep 17 00:00:00 2001
From: Colin White <colin@colinwhite.me>
Date: Wed, 13 Nov 2024 13:49:06 -0800
Subject: [PATCH 3/3] Updates.

---
 gradle/libs.versions.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5e8e2d9e9..3f0c15864 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ androidx-lifecycle = "2.8.7"
 androidx-tracing-perfetto = "1.0.0"
 atomicfu = "0.26.0"
 coroutines = "1.9.0"
-jetbrains-compose = "1.7.0"
+jetbrains-compose = "1.7.1"
 kotlin = "2.0.21"
 ktlint = "1.3.1"
 ktor2 = "2.3.12"
@@ -14,7 +14,7 @@ okhttp = "4.12.0"
 okio = "3.9.1"
 paparazzi = "1.3.5"
 roborazzi = "1.32.2"
-skiko = "0.8.15"
+skiko = "0.8.18"
 
 [plugins]
 baselineProfile = { id = "androidx.baselineprofile", version.ref = "androidx-benchmark" }