Update Compose to 1.11.0-beta02. Remove ios/mac x64 targets. (#3386)

colinrtwhite · web-flow · commit 98081471c0f8 · 2026-04-14T13:51:31.000-04:00
* Update Compose to 1.11.0-beta01. Remove ios/mac x64 targets.

* Fix deprecated API.

* Fix Compose 1.11 CI and desktop UI tests

* Adjust CI workflow defaults

* Optimize Skiko rect usage and fix macOS CI

* Update Compose to 1.11.0-beta02

* Use v2 desktop Compose UI test API

* Use macos-26 everywhere.

* Fix deprecations.

* Use named args.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,14 +52,13 @@ jobs:
               timeout-minutes: 5
               with:
                   cache-overwrite-existing: true
-                  cache-cleanup: true
 
             - name: Unit tests
               run: ./test.sh --skip-checks --skip-instrumentation-tests
 
     unit-tests-macos:
         name: Unit tests (macOS)
-        runs-on: macos-latest
+        runs-on: macos-26
         timeout-minutes: 120
         steps:
             - uses: actions/checkout@v6
@@ -72,7 +71,6 @@ jobs:
               timeout-minutes: 5
               with:
                   cache-overwrite-existing: true
-                  cache-cleanup: true
 
             - name: Unit tests
               run: ./gradlew iosSimulatorArm64Test macosArm64Test
@@ -96,7 +94,6 @@ jobs:
               timeout-minutes: 5
               with:
                   cache-overwrite-existing: true
-                  cache-cleanup: true
 
             # API 30+ emulators only have x86_64 system images.
             - name: Get AVD info
@@ -134,7 +131,6 @@ jobs:
               timeout-minutes: 5
               with:
                   cache-overwrite-existing: true
-                  cache-cleanup: true
 
             - name: Build Compose and View samples
               # Place resource restrictions on this task so it doesn't crash.
@@ -144,7 +140,7 @@ jobs:
 
     build-samples-macos:
         name: Build samples (macOS)
-        runs-on: macos-latest
+        runs-on: macos-26
         timeout-minutes: 60
         steps:
             - uses: actions/checkout@v6
@@ -157,14 +153,13 @@ jobs:
               timeout-minutes: 5
               with:
                   cache-overwrite-existing: true
-                  cache-cleanup: true
 
             - name: Build iOS sample
-              run: xcodebuild -project samples/compose/iosApp/iosApp.xcodeproj -scheme iosApp -destination 'generic/platform=iOS Simulator' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
+              run: xcodebuild -project samples/compose/iosApp/iosApp.xcodeproj -scheme iosApp -destination 'generic/platform=iOS Simulator' ARCHS=arm64 CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
 
     deploy-snapshot:
         name: Deploy snapshot
-        runs-on: macos-latest
+        runs-on: macos-26
         timeout-minutes: 180
         if: github.repository == 'coil-kt/coil' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/2.x')
         needs: [checks, unit-tests, unit-tests-macos, instrumentation-tests, build-samples, build-samples-macos]
diff --git a/buildSrc/src/main/kotlin/coil3/multiplatform.kt b/buildSrc/src/main/kotlin/coil3/multiplatform.kt
@@ -87,11 +87,9 @@ fun Project.addAllMultiplatformTargets(
                 }
             }
 
-            iosX64()
             iosArm64()
             iosSimulatorArm64()
 
-            macosX64()
             macosArm64()
 
             if (enableNativeLinux) {
diff --git a/coil-compose-core/api/coil-compose-core.klib.api b/coil-compose-core/api/coil-compose-core.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs]
+// Targets: [iosArm64, iosSimulatorArm64, js, macosArm64, wasmJs]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/coil-compose-core/src/nonAndroidMain/kotlin/coil3/compose/ImagePainter.nonAndroid.kt b/coil-compose-core/src/nonAndroidMain/kotlin/coil3/compose/ImagePainter.nonAndroid.kt
@@ -3,9 +3,9 @@ package coil3.compose
 import androidx.compose.ui.graphics.Canvas
 import androidx.compose.ui.graphics.FilterQuality
 import androidx.compose.ui.graphics.asComposeImageBitmap
-import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.skiaCanvas
 import coil3.BitmapImage
 import coil3.Image
 import coil3.PlatformContext
@@ -22,4 +22,4 @@ actual fun Image.asPainter(
     else -> ImagePainter(this)
 }
 
-internal actual val Canvas.nativeCanvas get() = nativeCanvas
+internal actual val Canvas.nativeCanvas get() = skiaCanvas
diff --git a/coil-compose/api/coil-compose.klib.api b/coil-compose/api/coil-compose.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, wasmJs]
+// Targets: [iosArm64, iosSimulatorArm64, js, macosArm64, wasmJs]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/coil-core/api/coil-core.klib.api b/coil-core/api/coil-core.klib.api
@@ -1,6 +1,6 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, wasmJs]
-// Alias: native => [iosArm64, iosSimulatorArm64, iosX64, linuxArm64, linuxX64, macosArm64, macosX64]
+// Targets: [iosArm64, iosSimulatorArm64, js, linuxArm64, linuxX64, macosArm64, wasmJs]
+// Alias: native => [iosArm64, iosSimulatorArm64, linuxArm64, linuxX64, macosArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/coil-core/src/nonAndroidMain/kotlin/coil3/ColorImage.kt b/coil-core/src/nonAndroidMain/kotlin/coil3/ColorImage.kt
@@ -2,7 +2,6 @@ package coil3
 
 import coil3.annotation.Poko
 import org.jetbrains.skia.Paint
-import org.jetbrains.skia.Rect
 
 @Poko
 actual class ColorImage actual constructor(
@@ -13,7 +12,6 @@ actual class ColorImage actual constructor(
     actual override val shareable: Boolean,
 ) : Image {
     private var lazyPaint: Paint? = null
-    private var lazyRect: Rect? = null
 
     actual override fun draw(canvas: Canvas) {
         val paint = lazyPaint ?: run {
@@ -22,11 +20,7 @@ actual class ColorImage actual constructor(
                 .also { lazyPaint = it }
         }
         if (width >= 0 && height >= 0) {
-            val rect = lazyRect ?: run {
-                Rect.makeWH(width.toFloat(), height.toFloat())
-                    .also { lazyRect = it }
-            }
-            canvas.drawRect(rect, paint)
+            canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), paint)
         } else {
             canvas.drawPaint(paint)
         }
diff --git a/coil-core/src/nonAndroidMain/kotlin/coil3/util/utils.nonAndroid.kt b/coil-core/src/nonAndroidMain/kotlin/coil3/util/utils.nonAndroid.kt
@@ -9,7 +9,7 @@ import coil3.size.Precision
 import org.jetbrains.skia.Bitmap
 import org.jetbrains.skia.Canvas
 import org.jetbrains.skia.Image as SkiaImage
-import org.jetbrains.skia.Rect
+import org.jetbrains.skia.SamplingMode
 import org.jetbrains.skia.impl.use
 
 internal actual fun println(
@@ -56,8 +56,17 @@ internal fun Bitmap.Companion.makeFromImage(
     Canvas(bitmap).use { canvas ->
         canvas.drawImageRect(
             image = image,
-            src = Rect.makeWH(srcWidth.toFloat(), srcHeight.toFloat()),
-            dst = Rect.makeWH(outWidth.toFloat(), outHeight.toFloat()),
+            srcLeft = 0f,
+            srcTop = 0f,
+            srcRight = srcWidth.toFloat(),
+            srcBottom = srcHeight.toFloat(),
+            dstLeft = 0f,
+            dstTop = 0f,
+            dstRight = outWidth.toFloat(),
+            dstBottom = outHeight.toFloat(),
+            samplingMode = SamplingMode.DEFAULT,
+            paint = null,
+            strict = false,
         )
     }
     return bitmap
diff --git a/coil-network-cache-control/api/coil-network-cache-control.klib.api b/coil-network-cache-control/api/coil-network-cache-control.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, wasmJs]
+// Targets: [iosArm64, iosSimulatorArm64, js, linuxArm64, linuxX64, macosArm64, wasmJs]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/coil-network-core/api/coil-network-core.klib.api b/coil-network-core/api/coil-network-core.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, wasmJs]
+// Targets: [iosArm64, iosSimulatorArm64, js, linuxArm64, linuxX64, macosArm64, wasmJs]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/coil-network-ktor2/api/coil-network-ktor2.klib.api b/coil-network-ktor2/api/coil-network-ktor2.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64]
+// Targets: [iosArm64, iosSimulatorArm64, js, linuxArm64, linuxX64, macosArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/coil-network-ktor3/api/coil-network-ktor3.klib.api b/coil-network-ktor3/api/coil-network-ktor3.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, wasmJs]
+// Targets: [iosArm64, iosSimulatorArm64, js, linuxArm64, linuxX64, macosArm64, wasmJs]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/coil-svg/api/coil-svg.klib.api b/coil-svg/api/coil-svg.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, wasmJs]
+// Targets: [iosArm64, iosSimulatorArm64, js, linuxArm64, linuxX64, macosArm64, wasmJs]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/coil-test/api/coil-test.klib.api b/coil-test/api/coil-test.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, wasmJs]
+// Targets: [iosArm64, iosSimulatorArm64, js, linuxArm64, linuxX64, macosArm64, wasmJs]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/coil-test/src/nonAndroidMain/kotlin/coil3/test/FakeImage.nonAndroid.kt b/coil-test/src/nonAndroidMain/kotlin/coil3/test/FakeImage.nonAndroid.kt
@@ -4,7 +4,6 @@ import coil3.Canvas
 import coil3.Image
 import coil3.annotation.Poko
 import org.jetbrains.skia.Paint
-import org.jetbrains.skia.Rect
 
 @Deprecated(
     message = "ColorImage supports the same functionality, has `color` as the first argument, " +
@@ -21,18 +20,13 @@ actual class FakeImage actual constructor(
     actual val color: Int,
 ) : Image {
     private var lazyPaint: Paint? = null
-    private var lazyRect: Rect? = null
 
     actual override fun draw(canvas: Canvas) {
         val paint = lazyPaint ?: run {
             Paint()
                 .apply { color = this@FakeImage.color }
                 .also { lazyPaint = it }
         }
-        val rect = lazyRect ?: run {
-            Rect.makeWH(width.toFloat(), height.toFloat())
-                .also { lazyRect = it }
-        }
-        canvas.drawRect(rect, paint)
+        canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), paint)
     }
 }
diff --git a/coil/api/coil.klib.api b/coil/api/coil.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, wasmJs]
+// Targets: [iosArm64, iosSimulatorArm64, js, linuxArm64, linuxX64, macosArm64, wasmJs]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ androidx-tracing-perfetto = "1.0.1"
 atomicfu = "0.32.1"
 coroutines = "1.10.2"
 dokka = "2.2.0"
-jetbrains-compose = "1.10.3"
+jetbrains-compose = "1.11.0-beta02"
 jetbrains-compose-material3 = "1.9.0"
 jetbrains-compose-material-icons-extended = "1.7.3"
 kotlin = "2.3.20"
@@ -19,7 +19,7 @@ okhttp = "4.12.0"
 okio = "3.17.0"
 paparazzi = "2.0.0-alpha04"
 roborazzi = "1.59.0"
-skiko = "0.9.37.4"
+skiko = "0.144.5"
 
 [plugins]
 baselineProfile = { id = "androidx.baselineprofile", version.ref = "androidx-benchmark" }
diff --git a/internal/test-compose-ui-multiplatform/src/jvmTest/kotlin/coil3/test/composeuimultiplatform/ComposeUiResourcesTest.kt b/internal/test-compose-ui-multiplatform/src/jvmTest/kotlin/coil3/test/composeuimultiplatform/ComposeUiResourcesTest.kt
@@ -1,7 +1,7 @@
 package coil3.test.composeuimultiplatform
 
 import androidx.compose.ui.test.ExperimentalTestApi
-import androidx.compose.ui.test.runComposeUiTest
+import androidx.compose.ui.test.v2.runDesktopComposeUiTest
 import coil3.Image
 import coil3.ImageLoader
 import coil3.compose.AsyncImage
@@ -36,7 +36,7 @@ class ComposeUiResourcesTest {
     private fun testComposeUiResource(
         uri: String,
         assert: Image.() -> Unit,
-    ) = runComposeUiTest {
+    ) = runDesktopComposeUiTest {
         val imageLoader = ImageLoader(context)
         val request = ImageRequest.Builder(context)
             .data(uri)
diff --git a/internal/test-roborazzi/src/jvmTest/kotlin/coil3/roborazzi/RoborazziComposeTestJvm.kt b/internal/test-roborazzi/src/jvmTest/kotlin/coil3/roborazzi/RoborazziComposeTestJvm.kt
@@ -9,7 +9,7 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.onRoot
-import androidx.compose.ui.test.runDesktopComposeUiTest
+import androidx.compose.ui.test.v2.runComposeUiTest
 import coil3.ColorImage
 import coil3.ImageLoader
 import coil3.PlatformContext
@@ -37,7 +37,7 @@ class RoborazziComposeTestJvm {
             .components { add(engine) }
             .build()
 
-        runDesktopComposeUiTest {
+        runComposeUiTest {
             setContent {
                 AsyncImage(
                     model = url,
@@ -65,7 +65,7 @@ class RoborazziComposeTestJvm {
             .components { add(engine) }
             .build()
 
-        runDesktopComposeUiTest {
+        runComposeUiTest {
             setContent {
                 Image(
                     painter = rememberAsyncImagePainter(
diff --git a/internal/test-utils/src/jvmMain/kotlin/coil3/test/utils/utils.jvm.kt b/internal/test-utils/src/jvmMain/kotlin/coil3/test/utils/utils.jvm.kt
@@ -6,7 +6,7 @@ import okio.buffer
 import org.jetbrains.skia.Bitmap
 import org.jetbrains.skia.Canvas
 import org.jetbrains.skia.Image
-import org.jetbrains.skia.Rect
+import org.jetbrains.skia.SamplingMode
 import org.jetbrains.skia.impl.use
 
 actual fun decodeBitmapResource(
@@ -23,8 +23,17 @@ actual fun decodeBitmapResource(
             Canvas(bitmap).use { canvas ->
                 canvas.drawImageRect(
                     image = image,
-                    src = Rect.makeWH(image.width.toFloat(), image.height.toFloat()),
-                    dst = Rect.makeWH(image.width.toFloat(), image.height.toFloat()),
+                    srcLeft = 0f,
+                    srcTop = 0f,
+                    srcRight = image.width.toFloat(),
+                    srcBottom = image.height.toFloat(),
+                    dstLeft = 0f,
+                    dstTop = 0f,
+                    dstRight = image.width.toFloat(),
+                    dstBottom = image.height.toFloat(),
+                    samplingMode = SamplingMode.DEFAULT,
+                    paint = null,
+                    strict = false,
                 )
             }
             return bitmap
diff --git a/samples/compose/build.gradle.kts b/samples/compose/build.gradle.kts
@@ -62,7 +62,6 @@ kotlin {
     }
 
     arrayOf(
-        iosX64(),
         iosArm64(),
         iosSimulatorArm64(),
     ).forEach { target ->

Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,9 @@ fun Project.addAllMultiplatformTargets(`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`- iosX64()`
`91`	`90`	`iosArm64()`
`92`	`91`	`iosSimulatorArm64()`
`93`	`92`
`94`		`- macosX64()`
`95`	`93`	`macosArm64()`
`96`	`94`
`97`	`95`	`if (enableNativeLinux) {`