Skip to content

Prepare ui-graphics/ui-text for future upstreaming: extract skiko implementation into separate module #3126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ivan Matkov (MatkovIvan) wants to merge 4 commits into
base: jb-main
Choose a base branch
from
Open

Prepare ui-graphics/ui-text for future upstreaming: extract skiko implementation into separate module #3126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c8f206
Extract the Skiko graphics backend into a new ui-skiko module
MatkovIvan Jun 16, 2026
9b25724
Extract the Skiko text backend into the ui-skiko module
MatkovIvan Jun 16, 2026
116f362
Register the Skiko UI implementation at Compose entry points
MatkovIvan Jun 16, 2026
8a2981a
Regenerate desktop & klib API baselines for the ui-skiko extraction
MatkovIvan Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsPublication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ object JetBrainsPublication {
supportedPlatforms = ComposePlatforms.SKIKO_SUPPORT,
),
ComposeComponent(":compose:ui:ui-graphics"),
ComposeComponent(":compose:ui:ui-skiko"),
ComposeComponent(":compose:ui:ui-test"),
ComposeComponent(
":compose:ui:ui-test-junit4",
Expand Down
3 changes: 3 additions & 0 deletions compose/foundation/foundation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down
15 changes: 15 additions & 0 deletions ...ose/foundation/foundation/src/skikoTest/kotlin/androidx/compose/foundation/OnClickTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,15 @@ import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.FrameRecomposer
import androidx.compose.ui.platform.LocalViewConfiguration
import androidx.compose.ui.platform.ViewConfiguration
import androidx.compose.ui.platform.registerSkikoComposeImplementation
import androidx.compose.ui.scene.CanvasLayersComposeScene
import androidx.compose.ui.test.ExperimentalTestApi
import androidx.compose.ui.test.runSkikoComposeUiTest
import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp
import androidx.compose.ui.use
import kotlin.test.BeforeTest
import kotlin.test.Test
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.runTest
Expand All @@ -48,6 +50,19 @@ import kotlinx.coroutines.test.runTest
@OptIn(ExperimentalFoundationApi::class, InternalComposeUiApi::class)
class OnClickTest {

@BeforeTest
fun registerSkikoBackend() {
registerSkikoComposeImplementation()
}

// TODO: re-enable per-test cleanup once tests that register the backend asynchronously
// (e.g. AWT ComposePanel/ComposeWindow via ComposeContainer on the EDT) no longer rely on
// the registration persisting across tests.
// @AfterTest
// fun clearSkikoBackend() {
// clearSkikoComposeImplementation()
// }

private fun testClick(
pointerMatcher: PointerMatcher,
button: PointerButton
Expand Down
18 changes: 17 additions & 1 deletion ...lin/androidx/compose/foundation/copyPasteAndroidTests/text/TextDelegateIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import androidx.compose.foundation.isEqualTo
import androidx.compose.foundation.isTrue
import androidx.compose.foundation.text.InternalFoundationTextApi
import androidx.compose.foundation.text.TextDelegate
import androidx.compose.ui.InternalComposeUiApi
import androidx.compose.ui.platform.registerSkikoComposeImplementation
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.TextStyle
Expand All @@ -32,12 +34,26 @@ import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.sp
import kotlin.math.roundToInt
import kotlin.test.BeforeTest
import kotlin.test.Ignore
import kotlin.test.Test

@OptIn(InternalFoundationTextApi::class)
@OptIn(InternalFoundationTextApi::class, InternalComposeUiApi::class)
class TextDelegateIntegrationTest {

@BeforeTest
fun registerSkikoBackend() {
registerSkikoComposeImplementation()
}

// TODO: re-enable per-test cleanup once tests that register the backend asynchronously
// (e.g. AWT ComposePanel/ComposeWindow via ComposeContainer on the EDT) no longer rely on
// the registration persisting across tests.
// @AfterTest
// fun clearSkikoBackend() {
// clearSkikoComposeImplementation()
// }

@Test
@Ignore // TODO: test is failing
fun minIntrinsicWidth_getter() = with(Density(1f, 1f)) {
Expand Down
17 changes: 17 additions & 0 deletions ...tion/src/skikoTest/kotlin/androidx/compose/foundation/shape/AbsoluteCutCornerShapeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package androidx.compose.foundation.shape

import androidx.compose.ui.InternalComposeUiApi
import androidx.compose.ui.platform.registerSkikoComposeImplementation
import kotlin.test.BeforeTest
import androidx.compose.foundation.assertThat
import androidx.compose.foundation.isEqualTo
import androidx.compose.foundation.isFalse
Expand All @@ -31,8 +34,22 @@ import androidx.compose.ui.unit.dp
import kotlin.test.Test
import kotlin.test.assertEquals

@OptIn(InternalComposeUiApi::class)
class AbsoluteCutCornerShapeTest {

@BeforeTest
fun registerSkikoBackend() {
registerSkikoComposeImplementation()
}

// TODO: re-enable per-test cleanup once tests that register the backend asynchronously
// (e.g. AWT ComposePanel/ComposeWindow via ComposeContainer on the EDT) no longer rely on
// the registration persisting across tests.
// @AfterTest
// fun clearSkikoBackend() {
// clearSkikoComposeImplementation()
// }

private var layoutDirection: LayoutDirection? = null

private val testParameters = arrayOf(
Expand Down
17 changes: 17 additions & 0 deletions .../src/skikoTest/kotlin/androidx/compose/foundation/shape/AbsoluteRoundedCornerShapeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package androidx.compose.foundation.shape

import androidx.compose.ui.InternalComposeUiApi
import androidx.compose.ui.platform.registerSkikoComposeImplementation
import kotlin.test.BeforeTest
import androidx.compose.foundation.assertThat
import androidx.compose.foundation.isEqualTo
import androidx.compose.foundation.isFalse
Expand All @@ -32,8 +35,22 @@ import androidx.compose.ui.unit.dp
import kotlin.test.Test
import kotlin.test.assertEquals

@OptIn(InternalComposeUiApi::class)
class AbsoluteRoundedCornerShapeTest {

@BeforeTest
fun registerSkikoBackend() {
registerSkikoComposeImplementation()
}

// TODO: re-enable per-test cleanup once tests that register the backend asynchronously
// (e.g. AWT ComposePanel/ComposeWindow via ComposeContainer on the EDT) no longer rely on
// the registration persisting across tests.
// @AfterTest
// fun clearSkikoBackend() {
// clearSkikoComposeImplementation()
// }

private var layoutDirection: LayoutDirection? = null

private val testParameters = arrayOf(
Expand Down
17 changes: 17 additions & 0 deletions ...n/foundation/src/skikoTest/kotlin/androidx/compose/foundation/shape/CutCornerShapeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package androidx.compose.foundation.shape

import androidx.compose.ui.InternalComposeUiApi
import androidx.compose.ui.platform.registerSkikoComposeImplementation
import kotlin.test.BeforeTest
import androidx.compose.foundation.assertThat
import androidx.compose.foundation.isEqualTo
import androidx.compose.foundation.isFalse
Expand All @@ -33,8 +36,22 @@ import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertTrue

@OptIn(InternalComposeUiApi::class)
class CutCornerShapeTest {

@BeforeTest
fun registerSkikoBackend() {
registerSkikoComposeImplementation()
}

// TODO: re-enable per-test cleanup once tests that register the backend asynchronously
// (e.g. AWT ComposePanel/ComposeWindow via ComposeContainer on the EDT) no longer rely on
// the registration persisting across tests.
// @AfterTest
// fun clearSkikoBackend() {
// clearSkikoComposeImplementation()
// }

private val density = Density(2f)
private val size = Size(100.0f, 150.0f)

Expand Down
17 changes: 17 additions & 0 deletions ...undation/src/skikoTest/kotlin/androidx/compose/foundation/shape/RoundedCornerShapeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package androidx.compose.foundation.shape

import androidx.compose.ui.InternalComposeUiApi
import androidx.compose.ui.platform.registerSkikoComposeImplementation
import kotlin.test.BeforeTest
import androidx.compose.foundation.assertThat
import androidx.compose.foundation.isEqualTo
import androidx.compose.foundation.isFalse
Expand All @@ -32,8 +35,22 @@ import androidx.compose.ui.unit.dp
import kotlin.test.Test
import kotlin.test.assertEquals

@OptIn(InternalComposeUiApi::class)
class RoundedCornerShapeTest {

@BeforeTest
fun registerSkikoBackend() {
registerSkikoComposeImplementation()
}

// TODO: re-enable per-test cleanup once tests that register the backend asynchronously
// (e.g. AWT ComposePanel/ComposeWindow via ComposeContainer on the EDT) no longer rely on
// the registration persisting across tests.
// @AfterTest
// fun clearSkikoBackend() {
// clearSkikoComposeImplementation()
// }

private val density = Density(2f)
private val size = Size(100.0f, 150.0f)

Expand Down
17 changes: 17 additions & 0 deletions ...n/src/skikoTest/kotlin/androidx/compose/foundation/text/CupertinoTextFieldDelegateTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

package androidx.compose.foundation.text

import androidx.compose.ui.InternalComposeUiApi
import androidx.compose.ui.platform.registerSkikoComposeImplementation
import kotlin.test.BeforeTest
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.MultiParagraph
import androidx.compose.ui.text.TextLayoutInput
Expand All @@ -34,7 +37,21 @@ import kotlin.test.Test
import kotlin.test.assertEquals
import kotlinx.test.IgnoreWasmTarget

@OptIn(InternalComposeUiApi::class)
class CupertinoTextFieldDelegateTest {

@BeforeTest
fun registerSkikoBackend() {
registerSkikoComposeImplementation()
}

// TODO: re-enable per-test cleanup once tests that register the backend asynchronously
// (e.g. AWT ComposePanel/ComposeWindow via ComposeContainer on the EDT) no longer rely on
// the registration persisting across tests.
// @AfterTest
// fun clearSkikoBackend() {
// clearSkikoComposeImplementation()
// }
private val sampleText =
"aaaa bbb cccc dd e fffffffff?????????!!!!!!! ...\n" + "ggggggg tttt\n" +
"Family emoji: \uD83D\uDC68\u200D\uD83D\uDC69\u200D\uD83D\uDC67\u200D\uD83D\uDC66\uD83D\uDC68\u200D\uD83D\uDC69\u200D\uD83D\uDC67\u200D\uD83D\uDC66, and some text at the end\n" +
Expand Down
1 change: 1 addition & 0 deletions compose/mpp/demo/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
Loading
Loading