From 482bda5edcc20bfe59d1b1e4ebe663136ea2e0b0 Mon Sep 17 00:00:00 2001 From: Alexander Maryanovsky Date: Sat, 3 Jun 2023 10:27:37 +0300 Subject: [PATCH] Moved SkikoTestOwner to the ui-test module. --- .../kotlin/androidx/compose/ui/test/ComposeUiTest.skikoMain.kt | 1 - .../kotlin/androidx/compose/ui/test/SkikoImageHelpers.kt | 1 - .../kotlin/androidx/compose/ui/test}/SkikoTestOwner.kt | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) rename compose/ui/{ui/src/skikoMain/kotlin/androidx/compose/ui/platform => ui-test/src/skikoMain/kotlin/androidx/compose/ui/test}/SkikoTestOwner.kt (97%) diff --git a/compose/ui/ui-test-junit4/src/skikoMain/kotlin/androidx/compose/ui/test/ComposeUiTest.skikoMain.kt b/compose/ui/ui-test-junit4/src/skikoMain/kotlin/androidx/compose/ui/test/ComposeUiTest.skikoMain.kt index fdbc321681891..c036542d3b9ec 100644 --- a/compose/ui/ui-test-junit4/src/skikoMain/kotlin/androidx/compose/ui/test/ComposeUiTest.skikoMain.kt +++ b/compose/ui/ui-test-junit4/src/skikoMain/kotlin/androidx/compose/ui/test/ComposeUiTest.skikoMain.kt @@ -26,7 +26,6 @@ import androidx.compose.ui.graphics.toComposeImageBitmap import androidx.compose.ui.node.RootForTest import androidx.compose.ui.platform.InfiniteAnimationPolicy import androidx.compose.ui.platform.SkiaRootForTest -import androidx.compose.ui.platform.SkikoTestOwner import androidx.compose.ui.semantics.SemanticsNode import androidx.compose.ui.test.junit4.MainTestClockImpl import androidx.compose.ui.test.junit4.UncaughtExceptionHandler diff --git a/compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/SkikoImageHelpers.kt b/compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/SkikoImageHelpers.kt index 9f9094803bbfa..0f1616e5689e0 100644 --- a/compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/SkikoImageHelpers.kt +++ b/compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/SkikoImageHelpers.kt @@ -18,7 +18,6 @@ package androidx.compose.ui.test import androidx.compose.ui.InternalComposeUiApi import androidx.compose.ui.graphics.ImageBitmap -import androidx.compose.ui.platform.SkikoTestOwner /** diff --git a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/SkikoTestOwner.kt b/compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/SkikoTestOwner.kt similarity index 97% rename from compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/SkikoTestOwner.kt rename to compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/SkikoTestOwner.kt index 06f520acac2bb..88887281df543 100644 --- a/compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/SkikoTestOwner.kt +++ b/compose/ui/ui-test/src/skikoMain/kotlin/androidx/compose/ui/test/SkikoTestOwner.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package androidx.compose.ui.platform +package androidx.compose.ui.test import androidx.compose.ui.InternalComposeUiApi import androidx.compose.ui.graphics.ImageBitmap