Enable Kruth snapshots on androidx.dev

This is not an indication we are planning to release or maintain Kruth in any shape or form. Test: ./gradlew bOS Change-Id: Ie2c38807b3ed2726e3e058c94fdc7ca608728ea5
AntonButov · Jul 6, 2023 · 14495fa · 14495fa
1 parent 40ef8e9
commit 14495fa
Show file tree

Hide file tree

Showing 62 changed files with 40 additions and 34 deletions.
diff --git a/datastore/datastore-core-okio/build.gradle b/datastore/datastore-core-okio/build.gradle
@@ -57,12 +57,12 @@ androidXMultiplatform {
         }
         commonTest {
             dependencies {
-                api(project(":internal-testutils-kmp"))
+                api(project(":kruth:kruth"))
                 api(libs.kotlinTestCommon)
                 api(libs.kotlinTestAnnotationsCommon)
                 api(libs.kotlinCoroutinesTest)
                 api(project(":internal-testutils-datastore"))
-                api(project(":internal-testutils-kmp"))
+                api(project(":kruth:kruth"))
             }
         }
         jvmTest {
@@ -71,7 +71,7 @@ androidXMultiplatform {
                 implementation(libs.kotlinTest)
                 implementation(libs.kotlinTestAnnotationsCommon)
                 api(project(":internal-testutils-datastore"))
-                api(project(":internal-testutils-kmp"))
+                api(project(":kruth:kruth"))
             }
         }
 

diff --git a/datastore/datastore-core/build.gradle b/datastore/datastore-core/build.gradle
@@ -92,7 +92,7 @@ androidXMultiplatform {
                 implementation(libs.kotlinCoroutinesTest)
                 implementation(libs.okio)
                 api(project(":datastore:datastore-core-okio"))
-                implementation(project(":internal-testutils-kmp"))
+                implementation(project(":kruth:kruth"))
                 implementation(project(":internal-testutils-datastore"))
             }
         }
@@ -101,7 +101,7 @@ androidXMultiplatform {
             dependencies {
                 implementation(libs.junit)
                 implementation(libs.kotlinTest)
-                implementation(project(":internal-testutils-kmp"))
+                implementation(project(":kruth:kruth"))
                 implementation(project(":internal-testutils-datastore"))
 
                 // Workaround bug in 1.8.0, was supposed be fixed in RC2/final, but apparently not.

diff --git a/datastore/datastore-preferences-core/build.gradle b/datastore/datastore-preferences-core/build.gradle
@@ -58,7 +58,7 @@ androidXMultiplatform {
                 implementation(libs.kotlinTestAnnotationsCommon)
                 implementation(libs.kotlinCoroutinesTest)
                 implementation(project(":datastore:datastore-core"))
-                implementation(project(":internal-testutils-kmp"))
+                implementation(project(":kruth:kruth"))
                 implementation(project(":internal-testutils-datastore"))
             }
         }
@@ -71,7 +71,7 @@ androidXMultiplatform {
                 implementation(libs.junit)
                 implementation(libs.kotlinTest)
                 implementation(project(":internal-testutils-datastore"))
-                implementation(project(":internal-testutils-kmp"))
+                implementation(project(":kruth:kruth"))
             }
         }
         if (enableNative) {
@@ -88,7 +88,7 @@ androidXMultiplatform {
                 dependencies {
                     implementation(libs.kotlinTest)
                     implementation(project(":internal-testutils-datastore"))
-                    implementation(project(":internal-testutils-kmp"))
+                    implementation(project(":kruth:kruth"))
                 }
             }
         }

diff --git a/datastore/datastore/build.gradle b/datastore/datastore/build.gradle
@@ -53,7 +53,7 @@ androidXMultiplatform {
                 implementation(libs.okio)
                 api(project(":datastore:datastore-core"))
                 api(project(":datastore:datastore-core-okio"))
-                implementation(project(":internal-testutils-kmp"))
+                implementation(project(":kruth:kruth"))
                 implementation(project(":internal-testutils-datastore"))
             }
         }
@@ -65,7 +65,7 @@ androidXMultiplatform {
             dependsOn(commonTest)
             dependencies {
                 implementation(libs.kotlinTest)
-                implementation(project(":internal-testutils-kmp"))
+                implementation(project(":kruth:kruth"))
                 implementation(project(":internal-testutils-datastore"))
             }
         }
@@ -81,7 +81,7 @@ androidXMultiplatform {
                 implementation(libs.junit)
                 implementation(libs.truth)
                 implementation(project(":internal-testutils-truth"))
-                implementation(project(":internal-testutils-kmp"))
+                implementation(project(":kruth:kruth"))
                 implementation(project(":internal-testutils-datastore"))
                 implementation(libs.kotlinCoroutinesTest)
                 implementation(libs.testRunner)

diff --git a/datastore/settings.gradle b/datastore/settings.gradle
@@ -32,7 +32,7 @@ playground {
         if (name.startsWith(":datastore")) return true
         if (name == ":annotation:annotation-sampled") return true
         if (name == ":internal-testutils-datastore") return true
-        if (name == ":internal-testutils-kmp") return true
+        if (name == ":kruth:kruth") return true
         if (name == ":internal-testutils-truth") return true
         return false
     })

diff --git a/testutils/testutils-kmp/OWNERS → kruth/kruth/OWNERS b/testutils/testutils-kmp/OWNERS → kruth/kruth/OWNERS
@@ -1,3 +1,2 @@
 [email protected]
-[email protected]
 [email protected]
diff --git a/testutils/testutils-kmp/build.gradle → kruth/kruth/build.gradle b/testutils/testutils-kmp/build.gradle → kruth/kruth/build.gradle
@@ -15,6 +15,8 @@
  */
 
 import androidx.build.LibraryType
+import androidx.build.PlatformIdentifier
+import androidx.build.Publish
 
 plugins {
     id("AndroidXPlugin")
@@ -26,6 +28,8 @@ androidXMultiplatform {
     linux()
     ios()
 
+    defaultPlatform(PlatformIdentifier.JVM)
+
     sourceSets {
         commonMain {
             dependencies {
@@ -58,5 +62,6 @@ androidXMultiplatform {
 }
 
 androidx {
+    publish = Publish.SNAPSHOT_ONLY
     type = LibraryType.INTERNAL_TEST_LIBRARY
 }
diff --git a/...n/kotlin/androidx/kruth/BooleanSubject.kt → ...n/kotlin/androidx/kruth/BooleanSubject.kt b/...n/kotlin/androidx/kruth/BooleanSubject.kt → ...n/kotlin/androidx/kruth/BooleanSubject.kt
diff --git a/...otlin/androidx/kruth/ComparableSubject.kt → ...otlin/androidx/kruth/ComparableSubject.kt b/...otlin/androidx/kruth/ComparableSubject.kt → ...otlin/androidx/kruth/ComparableSubject.kt
diff --git a/...in/kotlin/androidx/kruth/DoubleSubject.kt → ...in/kotlin/androidx/kruth/DoubleSubject.kt b/...in/kotlin/androidx/kruth/DoubleSubject.kt → ...in/kotlin/androidx/kruth/DoubleSubject.kt
diff --git a/...n/kotlin/androidx/kruth/FailingOrdered.kt → ...n/kotlin/androidx/kruth/FailingOrdered.kt b/...n/kotlin/androidx/kruth/FailingOrdered.kt → ...n/kotlin/androidx/kruth/FailingOrdered.kt
diff --git a/.../kotlin/androidx/kruth/FailureMetadata.kt → .../kotlin/androidx/kruth/FailureMetadata.kt b/.../kotlin/androidx/kruth/FailureMetadata.kt → .../kotlin/androidx/kruth/FailureMetadata.kt
diff --git a/.../kotlin/androidx/kruth/IterableSubject.kt → .../kotlin/androidx/kruth/IterableSubject.kt b/.../kotlin/androidx/kruth/IterableSubject.kt → .../kotlin/androidx/kruth/IterableSubject.kt
diff --git a/...commonMain/kotlin/androidx/kruth/Kruth.kt → ...commonMain/kotlin/androidx/kruth/Kruth.kt b/...commonMain/kotlin/androidx/kruth/Kruth.kt → ...commonMain/kotlin/androidx/kruth/Kruth.kt
diff --git a/...in/kotlin/androidx/kruth/KruthAsserter.kt → ...in/kotlin/androidx/kruth/KruthAsserter.kt b/...in/kotlin/androidx/kruth/KruthAsserter.kt → ...in/kotlin/androidx/kruth/KruthAsserter.kt
diff --git a/...monMain/kotlin/androidx/kruth/KruthExt.kt → ...monMain/kotlin/androidx/kruth/KruthExt.kt b/...monMain/kotlin/androidx/kruth/KruthExt.kt → ...monMain/kotlin/androidx/kruth/KruthExt.kt
diff --git a/...nMain/kotlin/androidx/kruth/MapSubject.kt → ...nMain/kotlin/androidx/kruth/MapSubject.kt b/...nMain/kotlin/androidx/kruth/MapSubject.kt → ...nMain/kotlin/androidx/kruth/MapSubject.kt
diff --git a/...monMain/kotlin/androidx/kruth/MathUtil.kt → ...monMain/kotlin/androidx/kruth/MathUtil.kt b/...monMain/kotlin/androidx/kruth/MathUtil.kt → ...monMain/kotlin/androidx/kruth/MathUtil.kt
diff --git a/...Main/kotlin/androidx/kruth/NoopOrdered.kt → ...Main/kotlin/androidx/kruth/NoopOrdered.kt b/...Main/kotlin/androidx/kruth/NoopOrdered.kt → ...Main/kotlin/androidx/kruth/NoopOrdered.kt
diff --git a/...mmonMain/kotlin/androidx/kruth/Ordered.kt → ...mmonMain/kotlin/androidx/kruth/Ordered.kt b/...mmonMain/kotlin/androidx/kruth/Ordered.kt → ...mmonMain/kotlin/androidx/kruth/Ordered.kt
diff --git a/...in/androidx/kruth/SimpleSubjectBuilder.kt → ...in/androidx/kruth/SimpleSubjectBuilder.kt b/...in/androidx/kruth/SimpleSubjectBuilder.kt → ...in/androidx/kruth/SimpleSubjectBuilder.kt
diff --git a/.../androidx/kruth/StandardSubjectBuilder.kt → .../androidx/kruth/StandardSubjectBuilder.kt b/.../androidx/kruth/StandardSubjectBuilder.kt → .../androidx/kruth/StandardSubjectBuilder.kt
diff --git a/...in/kotlin/androidx/kruth/StringSubject.kt → ...in/kotlin/androidx/kruth/StringSubject.kt b/...in/kotlin/androidx/kruth/StringSubject.kt → ...in/kotlin/androidx/kruth/StringSubject.kt
diff --git a/...mmonMain/kotlin/androidx/kruth/Subject.kt → ...mmonMain/kotlin/androidx/kruth/Subject.kt b/...mmonMain/kotlin/androidx/kruth/Subject.kt → ...mmonMain/kotlin/androidx/kruth/Subject.kt
diff --git a/...kotlin/androidx/kruth/ThrowableSubject.kt → ...kotlin/androidx/kruth/ThrowableSubject.kt b/...kotlin/androidx/kruth/ThrowableSubject.kt → ...kotlin/androidx/kruth/ThrowableSubject.kt
diff --git a/...commonMain/kotlin/androidx/kruth/Utils.kt → ...commonMain/kotlin/androidx/kruth/Utils.kt b/...commonMain/kotlin/androidx/kruth/Utils.kt → ...commonMain/kotlin/androidx/kruth/Utils.kt
diff --git a/...n/androidx/kruth/AssertWithMessageTest.kt → ...n/androidx/kruth/AssertWithMessageTest.kt b/...n/androidx/kruth/AssertWithMessageTest.kt → ...n/androidx/kruth/AssertWithMessageTest.kt
diff --git a/...tlin/androidx/kruth/BooleanSubjectTest.kt → ...tlin/androidx/kruth/BooleanSubjectTest.kt b/...tlin/androidx/kruth/BooleanSubjectTest.kt → ...tlin/androidx/kruth/BooleanSubjectTest.kt
diff --git a/...n/androidx/kruth/ComparableSubjectTest.kt → ...n/androidx/kruth/ComparableSubjectTest.kt b/...n/androidx/kruth/ComparableSubjectTest.kt → ...n/androidx/kruth/ComparableSubjectTest.kt
diff --git a/...otlin/androidx/kruth/DoubleSubjectTest.kt → ...otlin/androidx/kruth/DoubleSubjectTest.kt b/...otlin/androidx/kruth/DoubleSubjectTest.kt → ...otlin/androidx/kruth/DoubleSubjectTest.kt
diff --git a/...lin/androidx/kruth/IterableSubjectTest.kt → ...lin/androidx/kruth/IterableSubjectTest.kt b/...lin/androidx/kruth/IterableSubjectTest.kt → ...lin/androidx/kruth/IterableSubjectTest.kt
diff --git a/...otlin/androidx/kruth/KruthAsserterTest.kt → ...otlin/androidx/kruth/KruthAsserterTest.kt b/...otlin/androidx/kruth/KruthAsserterTest.kt → ...otlin/androidx/kruth/KruthAsserterTest.kt
diff --git a/...lin/androidx/kruth/MapSubjectKruthTest.kt → ...lin/androidx/kruth/MapSubjectKruthTest.kt b/...lin/androidx/kruth/MapSubjectKruthTest.kt → ...lin/androidx/kruth/MapSubjectKruthTest.kt
diff --git a/...t/kotlin/androidx/kruth/MapSubjectTest.kt → ...t/kotlin/androidx/kruth/MapSubjectTest.kt b/...t/kotlin/androidx/kruth/MapSubjectTest.kt → ...t/kotlin/androidx/kruth/MapSubjectTest.kt
diff --git a/...est/kotlin/androidx/kruth/MathUtilTest.kt → ...est/kotlin/androidx/kruth/MathUtilTest.kt b/...est/kotlin/androidx/kruth/MathUtilTest.kt → ...est/kotlin/androidx/kruth/MathUtilTest.kt
diff --git a/...roidx/kruth/RetainMatchingToStringTest.kt → ...roidx/kruth/RetainMatchingToStringTest.kt b/...roidx/kruth/RetainMatchingToStringTest.kt → ...roidx/kruth/RetainMatchingToStringTest.kt
diff --git a/...otlin/androidx/kruth/StringSubjectTest.kt → ...otlin/androidx/kruth/StringSubjectTest.kt b/...otlin/androidx/kruth/StringSubjectTest.kt → ...otlin/androidx/kruth/StringSubjectTest.kt
diff --git a/...kotlin/androidx/kruth/SubjectKruthTest.kt → ...kotlin/androidx/kruth/SubjectKruthTest.kt b/...kotlin/androidx/kruth/SubjectKruthTest.kt → ...kotlin/androidx/kruth/SubjectKruthTest.kt
diff --git a/...Test/kotlin/androidx/kruth/SubjectTest.kt → ...Test/kotlin/androidx/kruth/SubjectTest.kt b/...Test/kotlin/androidx/kruth/SubjectTest.kt → ...Test/kotlin/androidx/kruth/SubjectTest.kt
diff --git a/...est/kotlin/androidx/kruth/TestingUtils.kt → ...est/kotlin/androidx/kruth/TestingUtils.kt b/...est/kotlin/androidx/kruth/TestingUtils.kt → ...est/kotlin/androidx/kruth/TestingUtils.kt
diff --git a/...in/androidx/kruth/ThrowableSubjectTest.kt → ...in/androidx/kruth/ThrowableSubjectTest.kt b/...in/androidx/kruth/ThrowableSubjectTest.kt → ...in/androidx/kruth/ThrowableSubjectTest.kt
diff --git a/.../androidx/kruth/IterableSubjectJvmTest.kt → .../androidx/kruth/IterableSubjectJvmTest.kt b/.../androidx/kruth/IterableSubjectJvmTest.kt → .../androidx/kruth/IterableSubjectJvmTest.kt
diff --git a/libraryversions.toml b/libraryversions.toml
@@ -77,6 +77,7 @@ INPUT_MOTIONPREDICTION = "1.0.0-beta02"
 INSPECTION = "1.0.0"
 INTERPOLATOR = "1.1.0-alpha01"
 JAVASCRIPTENGINE = "1.0.0-alpha06"
+KRUTH = "0.1.0-dev01"
 LEANBACK = "1.2.0-alpha03"
 LEANBACK_GRID = "1.0.0-alpha02"
 LEANBACK_PAGING = "1.1.0-alpha10"
@@ -222,6 +223,7 @@ INSPECTION = { group = "androidx.inspection", atomicGroupVersion = "versions.INS
 INSPECTION_EXTENSIONS = { group = "androidx.inspection.extensions", atomicGroupVersion = "versions.SQLITE_INSPECTOR", overrideInclude = [ ":sqlite:sqlite-inspection" ] }
 INTERPOLATOR = { group = "androidx.interpolator", atomicGroupVersion = "versions.INTERPOLATOR" }
 JAVASCRIPTENGINE = { group = "androidx.javascriptengine", atomicGroupVersion = "versions.JAVASCRIPTENGINE" }
+KRUTH = { group = "androidx.kruth", atomicGroupVersion = "versions.KRUTH" }
 LEANBACK = { group = "androidx.leanback" }
 LEGACY = { group = "androidx.legacy" }
 LIBYUV = { group = "libyuv", atomicGroupVersion = "versions.LIBYUV" }

diff --git a/paging/paging-common/build.gradle b/paging/paging-common/build.gradle
@@ -58,7 +58,7 @@ androidXMultiplatform {
             dependencies {
                 implementation(libs.kotlinCoroutinesTest)
                 implementation(libs.kotlinTest)
-                implementation(project(":internal-testutils-kmp"))
+                implementation(project(":kruth:kruth"))
                 implementation(project(":internal-testutils-paging"))
             }
         }

diff --git a/paging/settings.gradle b/paging/settings.gradle
@@ -29,7 +29,7 @@ playground {
     selectProjectsFromAndroidX({ name ->
         if (name.startsWith(":paging")) return true
         if (name == ":annotation:annotation-sampled") return true
-        if (name == ":internal-testutils-kmp") return true
+        if (name == ":kruth:kruth") return true
         if (name == ":internal-testutils-ktx") return true
         if (name == ":internal-testutils-paging") return true
         if (name == ":compose:integration-tests:demos:common") return true

diff --git a/room/integration-tests/kotlintestapp/build.gradle b/room/integration-tests/kotlintestapp/build.gradle
@@ -103,7 +103,7 @@ dependencies {
         exclude group: "com.android.support", module: "support-annotations"
         exclude module: "hamcrest-core"
     })
-    androidTestImplementation(project(":internal-testutils-kmp"))
+    androidTestImplementation(project(":kruth:kruth"))
     androidTestImplementation(libs.kotlinTest)
     androidTestImplementation(project(":room:room-guava"))
     androidTestImplementation(project(":room:room-testing"))

diff --git a/room/room-common/build.gradle b/room/room-common/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     testImplementation(libs.junit)
     testImplementation(libs.mockitoCore4)
     testImplementation(libs.guava)
-    testImplementation(project(":internal-testutils-kmp"))
+    testImplementation(project(":kruth:kruth"))
 }
 
 androidx {

diff --git a/room/room-compiler-processing-testing/build.gradle b/room/room-compiler-processing-testing/build.gradle
@@ -29,7 +29,7 @@ dependencies {
     implementation(libs.kotlinStdlibJdk8) // KSP defines older version as dependency, force update.
     implementation(libs.ksp)
     implementation(libs.googleCompileTesting)
-    implementation(project(":internal-testutils-kmp"))
+    implementation(project(":kruth:kruth"))
     // specify these to match the kotlin compiler version in AndroidX rather than what KSP or KCT
     // uses
     implementation(libs.kotlinCompilerEmbeddable)

diff --git a/room/room-compiler-processing/build.gradle b/room/room-compiler-processing/build.gradle
@@ -86,7 +86,7 @@ dependencies {
     testImplementation(libs.kotlinMetadataJvm)
     testImplementation(project(":room:room-compiler-processing-testing"))
     testImplementation(project(":internal-testutils-common"))
-    testImplementation(project(":internal-testutils-kmp"))
+    testImplementation(project(":kruth:kruth"))
 }
 
 tasks.withType(KotlinCompile).configureEach {

diff --git a/room/room-compiler/build.gradle b/room/room-compiler/build.gradle
@@ -103,7 +103,7 @@ dependencies {
     implementation(libs.apacheCommonsCodec)
     implementation(libs.intellijAnnotations)
     testImplementation(libs.truth)
-    testImplementation(project(":internal-testutils-kmp"))
+    testImplementation(project(":kruth:kruth"))
     testImplementation(libs.testParameterInjector)
     testImplementation(libs.autoValue) // to access the processor in tests
     testImplementation(libs.autoServiceAnnotations)

diff --git a/room/room-gradle-plugin/build.gradle b/room/room-gradle-plugin/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     testImplementation(project(":internal-testutils-gradle-plugin"))
     testImplementation(gradleTestKit())
     testImplementation(libs.junit)
-    testImplementation(project(":internal-testutils-kmp"))
+    testImplementation(project(":kruth:kruth"))
     testImplementation(libs.testParameterInjector)
 
     testPlugin("com.android.tools.build:gradle:7.3.0")

diff --git a/room/room-ktx/build.gradle b/room/room-ktx/build.gradle
@@ -30,12 +30,12 @@ dependencies {
     api(libs.kotlinCoroutinesAndroid)
     testImplementation(libs.junit)
     testImplementation(libs.mockitoCore4)
-    testImplementation(project(":internal-testutils-kmp"))
+    testImplementation(project(":kruth:kruth"))
     testImplementation("androidx.lifecycle:lifecycle-livedata-core:2.0.0")
     testImplementation(libs.testRunner)
     testImplementation(libs.kotlinCoroutinesTest)
 
-    androidTestImplementation(project(":internal-testutils-kmp"))
+    androidTestImplementation(project(":kruth:kruth"))
     androidTestImplementation(libs.testRunner)
     androidTestImplementation(libs.kotlinCoroutinesTest)
 }

diff --git a/room/room-paging-guava/build.gradle b/room/room-paging-guava/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     implementation(project(":room:room-guava"))
     api("androidx.paging:paging-guava:3.1.1")
 
-    androidTestImplementation(project(":internal-testutils-kmp"))
+    androidTestImplementation(project(":kruth:kruth"))
     androidTestImplementation(libs.testExtJunitKtx)
     androidTestImplementation(libs.testRunner)
     androidTestImplementation(libs.kotlinTestJunit)

diff --git a/room/room-paging-rxjava2/build.gradle b/room/room-paging-rxjava2/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     implementation(project(":room:room-paging"))
     implementation(project(":room:room-rxjava2"))
 
-    androidTestImplementation(project(":internal-testutils-kmp"))
+    androidTestImplementation(project(":kruth:kruth"))
     androidTestImplementation(libs.testExtJunitKtx)
     androidTestImplementation(libs.testRunner)
     androidTestImplementation(libs.kotlinTestJunit) //

diff --git a/room/room-paging-rxjava3/build.gradle b/room/room-paging-rxjava3/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     implementation(project(":room:room-paging"))
     implementation(project(":room:room-rxjava3"))
 
-    androidTestImplementation(project(":internal-testutils-kmp"))
+    androidTestImplementation(project(":kruth:kruth"))
     androidTestImplementation(libs.testExtJunitKtx)
     androidTestImplementation(libs.testRunner)
     androidTestImplementation(libs.kotlinCoroutinesRx3)

diff --git a/room/room-paging/build.gradle b/room/room-paging/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     kspAndroidTest(
             project(path: ":room:room-compiler", configuration: "shadowAndImplementation")
     )
-    androidTestImplementation(project(":internal-testutils-kmp"))
+    androidTestImplementation(project(":kruth:kruth"))
     androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
     androidTestImplementation(project(":internal-testutils-common"))
     androidTestImplementation(projectOrArtifact(":paging:paging-testing"))

diff --git a/room/room-runtime/build.gradle b/room/room-runtime/build.gradle
@@ -56,7 +56,7 @@ dependencies {
     testImplementation("androidx.lifecycle:lifecycle-livedata-core:2.0.0")
     testImplementation(libs.kotlinStdlib)
     testImplementation(libs.kotlinTest)
-    testImplementation(project(":internal-testutils-kmp"))
+    testImplementation(project(":kruth:kruth"))
     testImplementation(libs.testRunner) // Needed for @FlakyTest and @Ignore
 
     androidTestImplementation(libs.junit)
@@ -68,7 +68,7 @@ dependencies {
     androidTestImplementation(libs.mockitoCore, excludes.bytebuddy) // DexMaker has it"s own MockMaker
     androidTestImplementation(libs.dexmakerMockito, excludes.bytebuddy) // DexMaker has it"s own MockMaker
     androidTestImplementation(project(":internal-testutils-truth")) // for assertThrows
-    androidTestImplementation(project(":internal-testutils-kmp"))
+    androidTestImplementation(project(":kruth:kruth"))
     androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
 
 }

diff --git a/room/room-rxjava2/build.gradle b/room/room-rxjava2/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     implementation("androidx.arch.core:core-runtime:2.2.0")
     implementation(libs.kotlinStdlib)
 
-    testImplementation(project(":internal-testutils-kmp"))
+    testImplementation(project(":kruth:kruth"))
     testImplementation(libs.kotlinTest)
     testImplementation(libs.mockitoCore4)
     testImplementation(libs.mockitoKotlin4)

diff --git a/room/room-rxjava3/build.gradle b/room/room-rxjava3/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     implementation("androidx.arch.core:core-runtime:2.2.0")
     implementation(libs.kotlinStdlib)
 
-    testImplementation(project(":internal-testutils-kmp"))
+    testImplementation(project(":kruth:kruth"))
     testImplementation(libs.kotlinTest)
     testImplementation(libs.mockitoCore4)
     testImplementation(libs.mockitoKotlin4)

diff --git a/room/room-testing/build.gradle b/room/room-testing/build.gradle
@@ -39,7 +39,7 @@ dependencies {
     api(libs.junit)
     implementation("androidx.arch.core:core-runtime:2.2.0")
     androidTestImplementation(libs.truth) // Kruth currently lacks StringSubject#containsMatch
-    androidTestImplementation(project(":internal-testutils-kmp"))
+    androidTestImplementation(project(":kruth:kruth"))
     androidTestImplementation(libs.kotlinStdlib)
     androidTestImplementation(libs.testExtJunit)
     androidTestImplementation(libs.testCore)

diff --git a/room/settings.gradle b/room/settings.gradle
@@ -33,7 +33,7 @@ playground {
         if (name == ":annotation:annotation-experimental-lint") return true
         if (name == ":annotation:annotation-experimental-lint-integration-tests") return true
         if (name == ":internal-testutils-truth") return true
-        if (name == ":internal-testutils-kmp") return true
+        if (name == ":kruth:kruth") return true
         return false
     })
 }
diff --git a/settings.gradle b/settings.gradle
@@ -1155,13 +1155,13 @@ includeProject(":internal-testutils-espresso", "testutils/testutils-espresso", [
 includeProject(":internal-testutils-fonts", "testutils/testutils-fonts", [BuildType.MAIN, BuildType.GLANCE, BuildType.MEDIA, BuildType.FLAN, BuildType.COMPOSE])
 includeProject(":internal-testutils-truth", "testutils/testutils-truth")
 includeProject(":internal-testutils-ktx", "testutils/testutils-ktx")
-includeProject(":internal-testutils-kmp", "testutils/testutils-kmp", [BuildType.MAIN, BuildType.INFRAROGUE, BuildType.KMP, BuildType.COMPOSE])
 includeProject(":internal-testutils-macrobenchmark", "testutils/testutils-macrobenchmark", [BuildType.MAIN, BuildType.COMPOSE])
 includeProject(":internal-testutils-navigation", "testutils/testutils-navigation", [BuildType.MAIN, BuildType.COMPOSE, BuildType.FLAN])
 includeProject(":internal-testutils-paging", "testutils/testutils-paging", [BuildType.MAIN, BuildType.COMPOSE])
 includeProject(":internal-testutils-paparazzi", "testutils/testutils-paparazzi", [BuildType.COMPOSE])
 includeProject(":internal-testutils-gradle-plugin", "testutils/testutils-gradle-plugin", [BuildType.MAIN, BuildType.FLAN, BuildType.COMPOSE, BuildType.TOOLS])
 includeProject(":internal-testutils-mockito", "testutils/testutils-mockito", [BuildType.MAIN, BuildType.MEDIA, BuildType.FLAN, BuildType.COMPOSE])
+includeProject(":kruth:kruth", [BuildType.MAIN, BuildType.INFRAROGUE, BuildType.KMP, BuildType.COMPOSE])
 
 /////////////////////////////
 //