Merge branch 'main' into 3.x

* main:
  Bump roborazzi from 1.2.0 to 1.3.0 (#1822)
  Bump app.cash.paparazzi:paparazzi-gradle-plugin from 1.3.0 to 1.3.1 (#1819)
  Bump com.diffplug.spotless from 6.19.0 to 6.20.0 (#1817)
  Add SHIFT6m to hardware bitmap blocklist (#1812)
  Bump okio from 3.3.0 to 3.4.0 (#1806)
  Fix incorrect link to OkHttpClient.newBuilder (#1803)

coil-base/src/androidMain/kotlin/coil/util/hardwareBitmaps.kt

@@ -203,7 +203,8 @@ private val IS_DEVICE_BLOCKED = when (SDK_INT) {
             "S80Lite", // Doogee S80Lite
             "SGINO6", // SGiNO 6
             "st18c10bnn", // Barnes and Noble BNTV650
-            "TECNO-CA8" // Tecno CAMON X Pro
+            "TECNO-CA8", // Tecno CAMON X Pro,
+            "SHIFT6m" // SHIFT 6m
         )
     }
     else -> false

coil-test-roborazzi/build.gradle.kts

@@ -24,6 +24,7 @@ dependencies {
     testImplementation(projects.coilTestInternal)
     testImplementation(libs.bundles.test.jvm)
     testImplementation(libs.androidx.compose.ui.test)
+    testImplementation(libs.roborazzi.compose)
     testImplementation(libs.roborazzi.core)
     testImplementation(libs.roborazzi.junit)
 }

coil-test-roborazzi/src/test/java/coil/test/RoborazziViewTest.kt

@@ -50,6 +50,6 @@ class RoborazziViewTest {
 
         // https://github.com/takahirom/roborazzi/issues/9
         onView(isRoot())
-            .captureRoboImage("src/test/snapshots/images/coil_test_RoborazziViewTest_loadView.png")
+            .captureRoboImage("src/test/snapshots/images/coil.test.RoborazziViewTest.loadView.png")
     }
 }

docs/recipes.md

@@ -41,7 +41,7 @@ val imageLoader = ImageLoader.Builder(context)
 ```
 
 !!! Note
-    If you already have a built `OkHttpClient`, use [`newBuilder()`](https://square.github.io/okhttp/4.x/okhttp/okhttp3/-http-url/new-builder/) to build a new client that shares resources with the original.
+    If you already have a built `OkHttpClient`, use [`newBuilder()`](https://square.github.io/okhttp/4.x/okhttp/okhttp3/-ok-http-client/#customize-your-client-with-newbuilder) to build a new client that shares resources with the original.
 
 #### Headers
 

gradle/libs.versions.toml

@@ -7,21 +7,21 @@ coroutines = "1.7.2"
 jetbrains-compose = "1.4.1"
 jetbrains-compose-compiler = "1.4.8"
 ktlint = "0.48.2"
-okio = "3.3.0"
-roborazzi = "1.2.0"
+okio = "3.4.0"
+roborazzi = "1.3.0"
 
 [plugins]
 binaryCompatibility = "org.jetbrains.kotlinx.binary-compatibility-validator:0.13.2"
 dokka = "org.jetbrains.dokka:1.8.20"
-spotless = "com.diffplug.spotless:6.19.0"
+spotless = "com.diffplug.spotless:6.20.0"
 
 [libraries]
 gradlePlugin-android = "com.android.tools.build:gradle:8.0.2"
 gradlePlugin-atomicFu = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.21.0"
 gradlePlugin-jetbrainsCompose = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "jetbrains-compose" }
 gradlePlugin-kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
 gradlePlugin-mavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.25.3"
-gradlePlugin-paparazzi = "app.cash.paparazzi:paparazzi-gradle-plugin:1.3.0"
+gradlePlugin-paparazzi = "app.cash.paparazzi:paparazzi-gradle-plugin:1.3.1"
 gradlePlugin-roborazzi = { module = "io.github.takahirom.roborazzi:roborazzi-gradle-plugin", version.ref = "roborazzi" }
 
 accompanist-drawablepainter = "com.google.accompanist:accompanist-drawablepainter:0.30.1"
@@ -78,6 +78,7 @@ okio-fakefilesystem = { module = "com.squareup.okio:okio-fakefilesystem", versio
 robolectric = "org.robolectric:robolectric:4.10.3"
 
 roborazzi-core = { module = "io.github.takahirom.roborazzi:roborazzi", version.ref = "roborazzi" }
+roborazzi-compose = { module = "io.github.takahirom.roborazzi:roborazzi-compose", version.ref = "roborazzi" }
 roborazzi-junit = { module = "io.github.takahirom.roborazzi:roborazzi-junit-rule", version.ref = "roborazzi" }
 
 skiko = "org.jetbrains.skiko:skiko:0.7.67"