Update Compose to 1.11.0-beta01. Remove ios/mac x64 targets.

colinrtwhite · colinrtwhite · commit 778a4c6bef75 · 2026-04-09T18:13:48.000-04:00
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-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/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-beta01"
 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.4"
 
 [plugins]
 baselineProfile = { id = "androidx.baselineprofile", version.ref = "androidx-benchmark" }
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) {`