Make paging-testing multiplatform with only a JVM implementation

androidx · Jul 6, 2023 · 01c6cda · 01c6cda
1 parent a03a8fb
commit 01c6cda
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 15 deletions.
diff --git a/paging/paging-testing/build.gradle b/paging/paging-testing/build.gradle
@@ -15,24 +15,39 @@
  */
 
 import androidx.build.LibraryType
+import androidx.build.PlatformIdentifier
 import androidx.build.Publish
 
 plugins {
     id("AndroidXPlugin")
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
 }
 
-dependencies {
-    api(libs.kotlinStdlib)
-    implementation(project(":paging:paging-common"))
+androidXMultiplatform {
+    jvm()
+    mac()
+    linux()
+    ios()
 
-    testImplementation(libs.junit)
-    testImplementation(libs.kotlinCoroutinesTest)
-    testImplementation((libs.kotlinCoroutinesAndroid))
-    testImplementation(project(":internal-testutils-paging"))
-    testImplementation(libs.kotlinTest)
-    testImplementation(libs.truth)
+    defaultPlatform(PlatformIdentifier.JVM)
+
+    sourceSets {
+        jvmMain {
+            dependencies {
+                api(libs.kotlinStdlib)
+                implementation(project(":paging:paging-common"))
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation(libs.junit)
+                implementation(libs.kotlinCoroutinesTest)
+                implementation((libs.kotlinCoroutinesAndroid))
+                implementation(project(":internal-testutils-paging"))
+                implementation(libs.kotlinTest)
+                implementation(libs.truth)
+            }
+        }
+    }
 }
 
 androidx {
@@ -42,7 +57,3 @@ androidx {
     description = "Test artifact for Paging implementation"
     publish = Publish.SNAPSHOT_AND_RELEASE
 }
-
-android {
-    namespace "androidx.paging.testing"
-}
diff --git a/...droidx/paging/testing/LoadErrorHandler.kt → ...droidx/paging/testing/LoadErrorHandler.kt b/...droidx/paging/testing/LoadErrorHandler.kt → ...droidx/paging/testing/LoadErrorHandler.kt
diff --git a/...roidx/paging/testing/PagerFlowSnapshot.kt → ...roidx/paging/testing/PagerFlowSnapshot.kt b/...roidx/paging/testing/PagerFlowSnapshot.kt → ...roidx/paging/testing/PagerFlowSnapshot.kt
diff --git a/...androidx/paging/testing/SnapshotLoader.kt → ...androidx/paging/testing/SnapshotLoader.kt b/...androidx/paging/testing/SnapshotLoader.kt → ...androidx/paging/testing/SnapshotLoader.kt
diff --git a/.../paging/testing/StaticListPagingSource.kt → .../paging/testing/StaticListPagingSource.kt b/.../paging/testing/StaticListPagingSource.kt → .../paging/testing/StaticListPagingSource.kt
diff --git a/.../testing/StaticListPagingSourceFactory.kt → .../testing/StaticListPagingSourceFactory.kt b/.../testing/StaticListPagingSourceFactory.kt → .../testing/StaticListPagingSourceFactory.kt
diff --git a/...java/androidx/paging/testing/TestPager.kt → ...tlin/androidx/paging/testing/TestPager.kt b/...java/androidx/paging/testing/TestPager.kt → ...tlin/androidx/paging/testing/TestPager.kt
diff --git a/...x/paging/testing/PagerFlowSnapshotTest.kt → ...x/paging/testing/PagerFlowSnapshotTest.kt b/...x/paging/testing/PagerFlowSnapshotTest.kt → ...x/paging/testing/PagerFlowSnapshotTest.kt
diff --git a/...ting/StaticListPagingSourceFactoryTest.kt → ...ting/StaticListPagingSourceFactoryTest.kt b/...ting/StaticListPagingSourceFactoryTest.kt → ...ting/StaticListPagingSourceFactoryTest.kt
diff --git a/...ing/testing/StaticListPagingSourceTest.kt → ...ing/testing/StaticListPagingSourceTest.kt b/...ing/testing/StaticListPagingSourceTest.kt → ...ing/testing/StaticListPagingSourceTest.kt
diff --git a/.../androidx/paging/testing/TestPagerTest.kt → .../androidx/paging/testing/TestPagerTest.kt b/.../androidx/paging/testing/TestPagerTest.kt → .../androidx/paging/testing/TestPagerTest.kt