Merge "[GH] Make `testutils-paging` a KMP" into androidx-main

12 files changed, 17 insertions, 8 deletions

diff --git a/paging/paging-common/build.gradle b/paging/paging-common/build.gradle
index b949efffad4..950b08f7fa9 100644
--- a/paging/paging-common/build.gradle
+++ b/paging/paging-common/build.gradle
@@ -59,6 +59,7 @@ androidXMultiplatform {
                 implementation(libs.kotlinCoroutinesTest)
                 implementation(libs.kotlinTest)
                 implementation(project(":internal-testutils-kmp"))
+                implementation(project(":internal-testutils-paging"))
             }
         }
 
@@ -69,7 +70,6 @@ androidXMultiplatform {
                 implementation(libs.mockitoKotlin4)
                 implementation(project(":internal-testutils-common"))
                 implementation(project(":internal-testutils-ktx"))
-                implementation(project(":internal-testutils-paging"))
             }
         }
 
diff --git a/testutils/testutils-paging/build.gradle b/testutils/testutils-paging/build.gradle
index 91046d5e8fe..a0ed808660d 100644
--- a/testutils/testutils-paging/build.gradle
+++ b/testutils/testutils-paging/build.gradle
@@ -14,18 +14,27 @@
  * limitations under the License.
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import androidx.build.LibraryType
 
 plugins {
     id("AndroidXPlugin")
-    id("kotlin")
 }
 
-dependencies {
-    api(libs.kotlinStdlib)
-    implementation(project(":paging:paging-common"))
-    implementation(libs.kotlinTest)
+androidXMultiplatform {
+    jvm()
+    mac()
+    linux()
+    ios()
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                api(libs.kotlinStdlib)
+                implementation(project(":paging:paging-common"))
+                implementation(libs.kotlinTest)
+            }
+        }
+    }
 }
 
 androidx {
diff --git a/testutils/testutils-paging/src/main/java/androidx/paging/CombinedLoadStatesCapture.kt b/testutils/testutils-paging/src/commonMain/kotlin/androidx/paging/CombinedLoadStatesCapture.kt
index b953c9ac7c2..b953c9ac7c2 100644
--- a/testutils/testutils-paging/src/main/java/androidx/paging/CombinedLoadStatesCapture.kt
+++ b/testutils/testutils-paging/src/commonMain/kotlin/androidx/paging/CombinedLoadStatesCapture.kt
diff --git a/testutils/testutils-paging/src/main/java/androidx/paging/LoadStateUtils.kt b/testutils/testutils-paging/src/commonMain/kotlin/androidx/paging/LoadStateUtils.kt
index 5f0c73c1424..5f0c73c1424 100644
--- a/testutils/testutils-paging/src/main/java/androidx/paging/LoadStateUtils.kt
+++ b/testutils/testutils-paging/src/commonMain/kotlin/androidx/paging/LoadStateUtils.kt
diff --git a/testutils/testutils-paging/src/main/java/androidx/paging/PageEventUtils.kt b/testutils/testutils-paging/src/commonMain/kotlin/androidx/paging/PageEventUtils.kt
index 006e366b3b5..58bfd7beded 100644
--- a/testutils/testutils-paging/src/main/java/androidx/paging/PageEventUtils.kt
+++ b/testutils/testutils-paging/src/commonMain/kotlin/androidx/paging/PageEventUtils.kt
@@ -22,7 +22,7 @@ fun <T> assertEvents(expected: List<T>, actual: List<T>) {
     try {
         assertEquals(expected, actual)
     } catch (e: Throwable) {
-        val msg = e.localizedMessage
+        val msg = e.message!!
             .replace("),", "),\n")
             .replace("<[", "<[\n ")
             .replace("actual", "\nactual")
diff --git a/testutils/testutils-paging/src/main/java/androidx/paging/RemoteMediatorMock.kt b/testutils/testutils-paging/src/commonMain/kotlin/androidx/paging/RemoteMediatorMock.kt
index 6d633ae0e1a..6d633ae0e1a 100644
--- a/testutils/testutils-paging/src/main/java/androidx/paging/RemoteMediatorMock.kt
+++ b/testutils/testutils-paging/src/commonMain/kotlin/androidx/paging/RemoteMediatorMock.kt
diff --git a/testutils/testutils-paging/src/main/java/androidx/paging/TestPagingDataDiffer.kt b/testutils/testutils-paging/src/commonMain/kotlin/androidx/paging/TestPagingDataDiffer.kt
index dc0d26723c1..dc0d26723c1 100644
--- a/testutils/testutils-paging/src/main/java/androidx/paging/TestPagingDataDiffer.kt
+++ b/testutils/testutils-paging/src/commonMain/kotlin/androidx/paging/TestPagingDataDiffer.kt
diff --git a/testutils/testutils-paging/src/main/java/androidx/paging/TestPagingSource.kt b/testutils/testutils-paging/src/commonMain/kotlin/androidx/paging/TestPagingSource.kt
index 809fef25e5e..809fef25e5e 100644
--- a/testutils/testutils-paging/src/main/java/androidx/paging/TestPagingSource.kt
+++ b/testutils/testutils-paging/src/commonMain/kotlin/androidx/paging/TestPagingSource.kt
diff --git a/testutils/testutils-paging/src/main/java/androidx/paging/LoadStateCapture.kt b/testutils/testutils-paging/src/jvmMain/kotlin/androidx/paging/LoadStateCapture.kt
index e893eaa4b8b..e893eaa4b8b 100644
--- a/testutils/testutils-paging/src/main/java/androidx/paging/LoadStateCapture.kt
+++ b/testutils/testutils-paging/src/jvmMain/kotlin/androidx/paging/LoadStateCapture.kt
diff --git a/testutils/testutils-paging/src/main/java/androidx/paging/TestItemKeyedDataSource.kt b/testutils/testutils-paging/src/jvmMain/kotlin/androidx/paging/TestItemKeyedDataSource.kt
index 1c63702410f..1c63702410f 100644
--- a/testutils/testutils-paging/src/main/java/androidx/paging/TestItemKeyedDataSource.kt
+++ b/testutils/testutils-paging/src/jvmMain/kotlin/androidx/paging/TestItemKeyedDataSource.kt
diff --git a/testutils/testutils-paging/src/main/java/androidx/paging/TestPageKeyedDataSource.kt b/testutils/testutils-paging/src/jvmMain/kotlin/androidx/paging/TestPageKeyedDataSource.kt
index 7905ef12c85..7905ef12c85 100644
--- a/testutils/testutils-paging/src/main/java/androidx/paging/TestPageKeyedDataSource.kt
+++ b/testutils/testutils-paging/src/jvmMain/kotlin/androidx/paging/TestPageKeyedDataSource.kt
diff --git a/testutils/testutils-paging/src/main/java/androidx/paging/TestPositionalDataSource.kt b/testutils/testutils-paging/src/jvmMain/kotlin/androidx/paging/TestPositionalDataSource.kt
index bbf019dd1e4..bbf019dd1e4 100644
--- a/testutils/testutils-paging/src/main/java/androidx/paging/TestPositionalDataSource.kt
+++ b/testutils/testutils-paging/src/jvmMain/kotlin/androidx/paging/TestPositionalDataSource.kt