Move some paging-common files to commonMain/commonTest

JetBrains · Jun 28, 2023 · 2a52799 · 2a52799
1 parent 78ac837
commit 2a52799
Show file tree

Hide file tree

Showing 16 changed files with 3 additions and 3 deletions.
diff --git a/paging/paging-common/build.gradle b/paging/paging-common/build.gradle
@@ -40,13 +40,13 @@ androidXMultiplatform {
             dependencies {
                 api(libs.kotlinStdlib)
                 api(libs.kotlinCoroutinesCore)
+                api("androidx.annotation:annotation:1.7.0-alpha02")
             }
         }
 
         jvmMain {
             dependsOn(commonMain)
             dependencies {
-                api("androidx.annotation:annotation:1.3.0")
                 api("androidx.arch.core:core-common:2.2.0")
 
             }
@@ -55,6 +55,8 @@ androidXMultiplatform {
         commonTest {
             dependencies {
                 implementation(libs.kotlinCoroutinesTest)
+                implementation(libs.kotlinTest)
+                implementation(project(":internal-testutils-kmp"))
             }
         }
 
@@ -64,10 +66,8 @@ androidXMultiplatform {
                 implementation(libs.mockitoCore4)
                 implementation(libs.mockitoKotlin4)
                 implementation(project(":internal-testutils-common"))
-                implementation(project(":internal-testutils-kmp"))
                 implementation(project(":internal-testutils-ktx"))
                 implementation(project(":internal-testutils-paging"))
-                implementation(libs.kotlinTest)
             }
         }
 

diff --git a/.../androidx/paging/CancelableChannelFlow.kt → .../androidx/paging/CancelableChannelFlow.kt b/.../androidx/paging/CancelableChannelFlow.kt → .../androidx/paging/CancelableChannelFlow.kt
diff --git a/...lin/androidx/paging/CombinedLoadStates.kt → ...lin/androidx/paging/CombinedLoadStates.kt b/...lin/androidx/paging/CombinedLoadStates.kt → ...lin/androidx/paging/CombinedLoadStates.kt
diff --git a/...tlin/androidx/paging/ConflatedEventBus.kt → ...tlin/androidx/paging/ConflatedEventBus.kt b/...tlin/androidx/paging/ConflatedEventBus.kt → ...tlin/androidx/paging/ConflatedEventBus.kt
diff --git a/...otlin/androidx/paging/ItemSnapshotList.kt → ...otlin/androidx/paging/ItemSnapshotList.kt b/...otlin/androidx/paging/ItemSnapshotList.kt → ...otlin/androidx/paging/ItemSnapshotList.kt
diff --git a/...mMain/kotlin/androidx/paging/LoadState.kt → ...nMain/kotlin/androidx/paging/LoadState.kt b/...mMain/kotlin/androidx/paging/LoadState.kt → ...nMain/kotlin/androidx/paging/LoadState.kt
diff --git a/...Main/kotlin/androidx/paging/LoadStates.kt → ...Main/kotlin/androidx/paging/LoadStates.kt b/...Main/kotlin/androidx/paging/LoadStates.kt → ...Main/kotlin/androidx/paging/LoadStates.kt
diff --git a/...vmMain/kotlin/androidx/paging/LoadType.kt → ...onMain/kotlin/androidx/paging/LoadType.kt b/...vmMain/kotlin/androidx/paging/LoadType.kt → ...onMain/kotlin/androidx/paging/LoadType.kt
diff --git a/...oidx/paging/MutableLoadStateCollection.kt → ...oidx/paging/MutableLoadStateCollection.kt b/...oidx/paging/MutableLoadStateCollection.kt → ...oidx/paging/MutableLoadStateCollection.kt
diff --git a/.../kotlin/androidx/paging/NullPaddedList.kt → .../kotlin/androidx/paging/NullPaddedList.kt b/.../kotlin/androidx/paging/NullPaddedList.kt → .../kotlin/androidx/paging/NullPaddedList.kt
diff --git a/...tlin/androidx/paging/SimpleChannelFlow.kt → ...tlin/androidx/paging/SimpleChannelFlow.kt b/...tlin/androidx/paging/SimpleChannelFlow.kt → ...tlin/androidx/paging/SimpleChannelFlow.kt
diff --git a/...Main/kotlin/androidx/paging/UiReceiver.kt → ...Main/kotlin/androidx/paging/UiReceiver.kt b/...Main/kotlin/androidx/paging/UiReceiver.kt → ...Main/kotlin/androidx/paging/UiReceiver.kt
diff --git a/...lin/androidx/paging/internal/Constants.kt → ...lin/androidx/paging/internal/Constants.kt b/...lin/androidx/paging/internal/Constants.kt → ...lin/androidx/paging/internal/Constants.kt
diff --git a/...otlin/androidx/paging/internal/LogUtil.kt → ...otlin/androidx/paging/internal/LogUtil.kt b/...otlin/androidx/paging/internal/LogUtil.kt → ...otlin/androidx/paging/internal/LogUtil.kt
diff --git a/.../androidx/paging/ConflatedEventBusTest.kt → .../androidx/paging/ConflatedEventBusTest.kt b/.../androidx/paging/ConflatedEventBusTest.kt → .../androidx/paging/ConflatedEventBusTest.kt
diff --git a/...n/androidx/paging/ItemSnapshotListTest.kt → ...n/androidx/paging/ItemSnapshotListTest.kt b/...n/androidx/paging/ItemSnapshotListTest.kt → ...n/androidx/paging/ItemSnapshotListTest.kt