Register the Skiko UI implementation at Compose entry points

Wire registerSkikoComposeImplementation() into the Skiko-backed Compose
entry points so the ui-graphics/ui-text registries are populated before
any scene is created: desktop ComposePanel/ComposeWindowPanel, macOS
ComposeWindow, iOS ComposeUIViewController, web ComposeWindowInternal,
ImageComposeScene, and the ui-test rules. Adds the :compose:ui:ui-skiko
dependency to the modules that rely on the Skiko backend transitively
(ui, ui-test, ui-test-junit4, foundation) and registers in the affected
test harnesses.

Author: MatkovIvan

compose/foundation/foundation/build.gradle

@@ -124,6 +124,9 @@ androidXMultiplatform {
             dependencies {
                 // TODO(https://youtrack.jetbrains.com/issue/CMP-219) Remove API
                 api(libs.skiko)
+                // TODO(https://youtrack.jetbrains.com/issue/CMP-10338): Remove direct dependency
+                implementation(project(":compose:ui:ui-skiko"))
+
                 implementation(libs.atomicFu)
             }
         }

compose/mpp/demo/build.gradle.kts

@@ -136,6 +136,7 @@ kotlin {
                 implementation(project(":compose:ui:ui-graphics"))
                 implementation(project(":compose:ui:ui-text"))
                 implementation(project(":compose:ui:ui-backhandler"))
+                implementation(project(":compose:ui:ui-skiko"))
                 implementation(project(":lifecycle:lifecycle-common"))
                 implementation(project(":lifecycle:lifecycle-runtime"))
                 implementation(project(":lifecycle:lifecycle-runtime-compose"))

compose/ui/ui-test-junit4/build.gradle

@@ -119,6 +119,7 @@ androidXMultiplatform {
             dependencies {
                 implementation(libs.truth)
                 implementation(libs.skiko)
+                implementation(project(":compose:ui:ui-skiko"))
             }
         }
 

compose/ui/ui-test-junit4/src/desktopMain/kotlin/androidx/compose/ui/test/junit4/DesktopComposeTestRule.desktop.kt

@@ -18,6 +18,7 @@ package androidx.compose.ui.test.junit4
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.InternalComposeUiApi
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.scene.ComposeScene
 import androidx.compose.ui.test.DesktopComposeUiTest
 import androidx.compose.ui.test.ExperimentalTestApi
@@ -44,14 +45,16 @@ import org.junit.runners.model.Statement
             "coroutines are queued rather than executed immediately.",
     level = DeprecationLevel.WARNING,
 )
-@OptIn(InternalTestApi::class, ExperimentalTestApi::class)
-actual fun createComposeRule(): ComposeContentTestRule =
-    DesktopComposeTestRule(
+@OptIn(InternalTestApi::class, ExperimentalTestApi::class, InternalComposeUiApi::class)
+actual fun createComposeRule(): ComposeContentTestRule {
+    registerSkikoComposeImplementation()
+    return DesktopComposeTestRule(
         DesktopComposeUiTest(
             effectContext = EmptyCoroutineContext,
             useStandardTestDispatcherForComposition = false
         )
     )
+}
 
 @Deprecated(
     message =
@@ -61,14 +64,16 @@ actual fun createComposeRule(): ComposeContentTestRule =
     level = DeprecationLevel.WARNING,
 )
 @ExperimentalTestApi
-@OptIn(InternalTestApi::class)
-actual fun createComposeRule(effectContext: CoroutineContext): ComposeContentTestRule =
-    DesktopComposeTestRule(
+@OptIn(InternalTestApi::class, InternalComposeUiApi::class)
+actual fun createComposeRule(effectContext: CoroutineContext): ComposeContentTestRule {
+    registerSkikoComposeImplementation()
+    return DesktopComposeTestRule(
         DesktopComposeUiTest(
             effectContext = effectContext,
             useStandardTestDispatcherForComposition = false
         )
     )
+}
 
 @InternalTestApi
 @OptIn(ExperimentalTestApi::class)

compose/ui/ui-test-junit4/src/desktopMain/kotlin/androidx/compose/ui/test/junit4/DesktopScreenshotTestRule.desktop.kt

@@ -16,6 +16,8 @@
 package androidx.compose.ui.test.junit4
 
 import androidx.annotation.FloatRange
+import androidx.compose.ui.InternalComposeUiApi
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.test.InternalTestApi
 import androidx.compose.ui.test.junit4.ScreenshotResultProto.Status
 import androidx.compose.ui.test.junit4.matchers.BitmapMatcher
@@ -57,10 +59,12 @@ private data class ScreenshotResultProto(
 }
 
 @InternalTestApi
+@OptIn(InternalComposeUiApi::class)
 fun DesktopScreenshotTestRule(
     modulePath: String,
     fsGoldenPath: String = System.getProperty("GOLDEN_PATH")
 ): ScreenshotTestRule {
+    registerSkikoComposeImplementation()
     return ScreenshotTestRule(fsGoldenPath, modulePath)
 }
 

compose/ui/ui-test/build.gradle

@@ -125,6 +125,7 @@ androidXMultiplatform {
             dependsOn(commonMain)
             dependencies {
                 implementation(libs.atomicFu)
+                implementation(project(":compose:ui:ui-skiko"))
 
                 // Required to properly resolve supertypes of DefaultArchitectureComponentsOwner
                 // Keep in sync with :ui:ui module

compose/ui/ui-test/src/desktopMain/kotlin/androidx/compose/ui/test/ComposeUiTest.desktop.kt

@@ -16,6 +16,8 @@
 
 package androidx.compose.ui.test
 
+import androidx.compose.ui.InternalComposeUiApi
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.unit.Density
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
@@ -38,6 +40,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
     level = DeprecationLevel.WARNING,
 )
 @ExperimentalTestApi
+@OptIn(InternalComposeUiApi::class)
 fun runDesktopComposeUiTest(
     width: Int = 1024,
     height: Int = 768,
@@ -46,6 +49,7 @@ fun runDesktopComposeUiTest(
     testTimeout: Duration = Duration.INFINITE,
     block: suspend DesktopComposeUiTest.() -> Unit
 ) {
+    registerSkikoComposeImplementation()
     kotlinx.coroutines.test.runTest {
         with(
             DesktopComposeUiTest(

compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/ComposeUiTest.skiko.kt

@@ -36,6 +36,7 @@ import androidx.compose.ui.platform.PlatformDragAndDropSource
 import androidx.compose.ui.platform.PlatformTextInputMethodRequest
 import androidx.compose.ui.platform.PlatformWindowInsets
 import androidx.compose.ui.platform.WindowInfo
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.scene.CanvasLayersComposeScene
 import androidx.compose.ui.scene.ComposeScene
 import androidx.compose.ui.semantics.SemanticsNode
@@ -113,6 +114,7 @@ fun runSkikoComposeUiTest(
     testTimeout: Duration = Duration.INFINITE,
     block: suspend SkikoComposeUiTest.() -> Unit
 ): TestResult {
+    registerSkikoComposeImplementation()
     return SkikoComposeUiTest(
         width = size.width.roundToInt(),
         height = size.height.roundToInt(),

compose/ui/ui/build.gradle

@@ -206,6 +206,7 @@ androidXMultiplatform {
             dependsOn(commonMain)
             dependencies {
                 api(project(":compose:ui:ui-graphics"))
+                implementation(project(":compose:ui:ui-skiko"))
                 api(project(":compose:ui:ui-text"))
                 api(libs.skiko)
                 implementation(libs.atomicFu)
@@ -222,6 +223,7 @@ androidXMultiplatform {
                 // TODO: Move to commonTest?
                 implementation(project(":compose:material:material"))
                 implementation(project(":compose:foundation:foundation"))
+                implementation(project(":compose:ui:ui-skiko"))
                 implementation(project(":compose:ui:ui-test"))
             }
         }

compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/ComposePanel.desktop.kt

@@ -30,6 +30,7 @@ import androidx.compose.ui.awt.RenderSettings.SkiaSurface
 import androidx.compose.ui.awt.RenderSettings.SwingGraphics
 import androidx.compose.ui.focus.FocusDirection
 import androidx.compose.ui.isClearFocusOnMouseDownEnabled
+import androidx.compose.ui.platform.registerSkikoComposeImplementation
 import androidx.compose.ui.scene.ComposeContainer
 import androidx.compose.ui.semantics.SemanticsOwner
 import androidx.compose.ui.unit.ExperimentalUnitApi
@@ -96,6 +97,7 @@ class ComposePanel @ExperimentalComposeUiApi constructor(
     }
 
     init {
+        registerSkikoComposeImplementation()
         check(isEventDispatchThread()) {
             "ComposePanel should be created inside AWT Event Dispatch Thread" +
                 " (use SwingUtilities.invokeLater).\n" +