Merge pull request #347 from gvolpe/feature/weaver-discipline

Remove DisciplineSuite in favor of weaver-discipline
gvolpe · Apr 7, 2021 · d43045d · d43045d
2 parents 02bef8a + 6545555
commit d43045d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 30 deletions.
diff --git a/build.sbt b/build.sbt
@@ -30,9 +30,9 @@ lazy val tests = (project in file("modules/tests"))
           CompilerPlugin.betterMonadicFor,
           CompilerPlugin.semanticDB,
           Libraries.catsLaws,
-          Libraries.discipline,
           Libraries.log4catsNoOp,
           Libraries.weaverCats,
+          Libraries.weaverDiscipline,
           Libraries.weaverScalaCheck
         )
   )

diff --git a/modules/tests/src/main/scala/suite/DisciplineSuite.scala b/modules/tests/src/main/scala/suite/DisciplineSuite.scala
diff --git a/modules/tests/src/test/scala/shop/domain/OrphanSuite.scala b/modules/tests/src/test/scala/shop/domain/OrphanSuite.scala
@@ -3,9 +3,10 @@ package shop.domain
 import cats.kernel.laws.discipline.MonoidTests
 import org.scalacheck.{ Arbitrary, Gen }
 import squants.market.{ Money, USD }
-import suite.DisciplineSuite
+import weaver.FunSuite
+import weaver.discipline.Discipline
 
-object OrphanSuite extends DisciplineSuite {
+object OrphanSuite extends FunSuite with Discipline {
 
   implicit val arbMoney: Arbitrary[Money] =
     Arbitrary {

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -9,7 +9,6 @@ object Dependencies {
     val circe         = "0.14.0-M5"
     val ciris         = "2.0.0-RC2"
     val derevo        = "0.12.2"
-    val discipline    = "1.1.4"
     val javaxCrypto   = "1.0.1"
     val fs2           = "3.0.1"
     val http4s        = "1.0.0-M20"
@@ -81,9 +80,9 @@ object Dependencies {
 
     // Test
     val catsLaws         = "org.typelevel"       %% "cats-laws"         % V.cats
-    val discipline       = "org.typelevel"       %% "discipline-core"   % V.discipline
     val log4catsNoOp     = "org.typelevel"       %% "log4cats-noop"     % V.log4cats
     val weaverCats       = "com.disneystreaming" %% "weaver-cats"       % V.weaver
+    val weaverDiscipline = "com.disneystreaming" %% "weaver-discipline" % V.weaver
     val weaverScalaCheck = "com.disneystreaming" %% "weaver-scalacheck" % V.weaver
 
     // Scalafix rules