diff --git a/build.sbt b/build.sbt index d1b6ab7..80f8dec 100644 --- a/build.sbt +++ b/build.sbt @@ -89,6 +89,7 @@ lazy val api = project ) .settings( libraryDependencies ++= Seq( + Deps.Gs.Uuid, Deps.Cats.Core, Deps.Cats.Effect, Deps.Natchez.Core @@ -106,7 +107,6 @@ lazy val runtime = project ) .settings( libraryDependencies ++= Seq( - Deps.Gs.Uuid, Deps.Gs.Timing, Deps.Cats.Core, Deps.Cats.Effect, diff --git a/modules/runtime/src/main/scala/gs/test/v0/runtime/SuiteExecution.scala b/modules/api/src/main/scala/gs/test/v0/api/SuiteExecution.scala similarity index 91% rename from modules/runtime/src/main/scala/gs/test/v0/runtime/SuiteExecution.scala rename to modules/api/src/main/scala/gs/test/v0/api/SuiteExecution.scala index aa2a29d..64a75a6 100644 --- a/modules/runtime/src/main/scala/gs/test/v0/runtime/SuiteExecution.scala +++ b/modules/api/src/main/scala/gs/test/v0/api/SuiteExecution.scala @@ -1,4 +1,4 @@ -package gs.test.v0.runtime +package gs.test.v0.api import gs.uuid.v0.UUID import java.time.Instant diff --git a/modules/runtime/src/main/scala/gs/test/v0/runtime/TestExecution.scala b/modules/api/src/main/scala/gs/test/v0/api/TestExecution.scala similarity index 91% rename from modules/runtime/src/main/scala/gs/test/v0/runtime/TestExecution.scala rename to modules/api/src/main/scala/gs/test/v0/api/TestExecution.scala index 2d779d0..cca8546 100644 --- a/modules/runtime/src/main/scala/gs/test/v0/runtime/TestExecution.scala +++ b/modules/api/src/main/scala/gs/test/v0/api/TestExecution.scala @@ -1,11 +1,6 @@ -package gs.test.v0.runtime +package gs.test.v0.api import cats.Show -import gs.test.v0.api.Marker -import gs.test.v0.api.PermanentId -import gs.test.v0.api.SourcePosition -import gs.test.v0.api.Tag -import gs.test.v0.api.TestFailure import gs.uuid.v0.UUID import scala.concurrent.duration.FiniteDuration diff --git a/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/EngineResult.scala b/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/EngineResult.scala deleted file mode 100644 index 2b19bdc..0000000 --- a/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/EngineResult.scala +++ /dev/null @@ -1,7 +0,0 @@ -package gs.test.v0.runtime.engine - -import gs.test.v0.runtime.SuiteExecution - -final class EngineResult( - val suiteExecution: SuiteExecution -) diff --git a/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/EngineStats.scala b/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/EngineStats.scala index da4eb7f..e7a5b5b 100644 --- a/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/EngineStats.scala +++ b/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/EngineStats.scala @@ -3,7 +3,7 @@ package gs.test.v0.runtime.engine import cats.effect.Async import cats.effect.Ref import cats.syntax.all.* -import gs.test.v0.runtime.TestExecution +import gs.test.v0.api.TestExecution import java.util.concurrent.TimeUnit import scala.concurrent.duration.FiniteDuration diff --git a/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/GroupResult.scala b/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/GroupResult.scala index dbd207a..e306f77 100644 --- a/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/GroupResult.scala +++ b/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/GroupResult.scala @@ -1,7 +1,7 @@ package gs.test.v0.runtime.engine +import gs.test.v0.api.TestExecution import gs.test.v0.api.TestGroupDefinition -import gs.test.v0.runtime.TestExecution import scala.concurrent.duration.FiniteDuration /** Represents the results of executing an entire group of tests. diff --git a/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/TestEngine.scala b/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/TestEngine.scala index 9d9246e..7239cfd 100644 --- a/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/TestEngine.scala +++ b/modules/runtime/src/main/scala/gs/test/v0/runtime/engine/TestEngine.scala @@ -2,12 +2,12 @@ package gs.test.v0.runtime.engine import cats.effect.Async import cats.syntax.all.* +import gs.test.v0.api.SuiteExecution import gs.test.v0.api.TestDefinition +import gs.test.v0.api.TestExecution import gs.test.v0.api.TestFailure import gs.test.v0.api.TestGroupDefinition import gs.test.v0.api.TestSuite -import gs.test.v0.runtime.SuiteExecution -import gs.test.v0.runtime.TestExecution import gs.timing.v0.Timing import gs.uuid.v0.UUID import java.time.Clock