From 3205df37bef431d4e8ee309b80b3eac95bcb6d9d Mon Sep 17 00:00:00 2001 From: Colin White Date: Fri, 25 Oct 2024 15:18:39 -0700 Subject: [PATCH] Add extra changes. --- 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 a514c3b60b..9483214218 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -161,6 +161,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 12472e528a..f66c98aa0c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ okhttp = "4.12.0" okio = "3.9.1" paparazzi = "1.3.4" roborazzi = "1.29.0" -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 b580c580da..bc6904ea03 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 */