Merge pull request #84 from amzn/rwo/test-fixture

Use testFixtures for compiler test utils
amzn · Nov 15, 2024 · 439e5b4 · 439e5b4
2 parents 8ee9454 + 9468ca7
commit 439e5b4
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 17 deletions.
diff --git a/compiler-test/build.gradle b/compiler-test/build.gradle
diff --git a/compiler-test/gradle.properties b/compiler-test/gradle.properties
diff --git a/compiler-utils/build.gradle b/compiler-utils/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'software.amazon.lib.jvm'
+    id 'java-test-fixtures'
 }
 
 dependencies {
@@ -9,4 +10,11 @@ dependencies {
     implementation project(':runtime')
     implementation libs.kotlin.poet.ksp
     implementation libs.kotlin.inject.runtime
+
+    testFixturesApi libs.kotlin.compile.testing.core
+    testFixturesApi libs.ksp.api
+
+    testFixturesImplementation project(':runtime')
+    testFixturesImplementation libs.assertk
+    testFixturesImplementation libs.kotlin.compile.testing.ksp
 }
diff --git a/...n/lastmile/kotlin/inject/anvil/Asserts.kt → ...n/lastmile/kotlin/inject/anvil/Asserts.kt b/...n/lastmile/kotlin/inject/anvil/Asserts.kt → ...n/lastmile/kotlin/inject/anvil/Asserts.kt
diff --git a/...e/kotlin/inject/anvil/CommonSourceCode.kt → ...e/kotlin/inject/anvil/CommonSourceCode.kt b/...e/kotlin/inject/anvil/CommonSourceCode.kt → ...e/kotlin/inject/anvil/CommonSourceCode.kt
diff --git a/...stmile/kotlin/inject/anvil/Compilation.kt → ...stmile/kotlin/inject/anvil/Compilation.kt b/...stmile/kotlin/inject/anvil/Compilation.kt → ...stmile/kotlin/inject/anvil/Compilation.kt
diff --git a/compiler/build.gradle b/compiler/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     // Gives us access to annotations.
     implementation libs.kotlin.inject.runtime
 
-    testImplementation project(':compiler-test')
+    testImplementation(testFixtures(project(':compiler-utils')))
     testImplementation project(':runtime-optional')
     testImplementation libs.assertk
     testImplementation libs.kotlin.compile.testing.core

diff --git a/settings.gradle b/settings.gradle
@@ -37,7 +37,6 @@ develocity {
 rootProject.name = 'kotlin-inject-anvil'
 
 include ':compiler'
-include ':compiler-test'
 include ':compiler-utils'
 include ':runtime'
 include ':runtime-optional'