Merge pull request #436 from lukestephenson/patch-2

Build monix module with scala 3
disneystreaming · Dec 1, 2021 · 693196e · 693196e
2 parents 4cd335e + b381605
commit 693196e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/build.sbt b/build.sbt
@@ -304,7 +304,7 @@ lazy val coreMonix = projectMatrix
 
 lazy val coreMonixBio = projectMatrix
   .in(file("modules/core/monixBio"))
-  .sparse(withCE3 = false, withJS = true, withScala3 = false)
+  .sparse(withCE3 = false, withJS = true, withScala3 = true)
   .dependsOn(core)
   .settings(WeaverPlugin.simpleLayout)
   .settings(
@@ -356,7 +356,7 @@ lazy val cats = projectMatrix
 
 lazy val monix = projectMatrix
   .in(file("modules/framework/monix"))
-  .sparse(withCE3 = false, withJS = true, withScala3 = false)
+  .sparse(withCE3 = false, withJS = true, withScala3 = true)
   .dependsOn(framework, coreMonix)
   .settings(WeaverPlugin.simpleLayout)
   .settings(
@@ -366,7 +366,7 @@ lazy val monix = projectMatrix
 
 lazy val monixBio = projectMatrix
   .in(file("modules/framework/monix-bio"))
-  .sparse(withCE3 = false, withJS = true, withScala3 = false)
+  .sparse(withCE3 = false, withJS = true, withScala3 = true)
   .dependsOn(framework, coreMonixBio)
   .settings(WeaverPlugin.simpleLayout)
   .settings(

diff --git a/modules/core/monixBio/src/weaver/monixbiocompat/suites.scala b/modules/core/monixBio/src/weaver/monixbiocompat/suites.scala
@@ -43,9 +43,10 @@ abstract class MutableIOSuite
     with BaseIOSuite
     with Expectations.Helpers {
 
-  implicit protected def effectCompat               = MonixBIOUnsafeRun
-  final implicit protected def scheduler: Scheduler = effectCompat.scheduler
-  def getSuite: EffectSuite[Task]                   = this
+  implicit protected def effectCompat = MonixBIOUnsafeRun
+  final implicit protected def scheduler: Scheduler =
+    MonixBIOUnsafeRun.scheduler
+  def getSuite: EffectSuite[Task] = this
 
   override def test(name: TestName): PartiallyAppliedTest =
     new SubPartiallyAppliedTest(name)
@@ -70,7 +71,8 @@ trait FunIOSuite
     extends FunSuiteF[Task]
     with BaseIOSuite
     with Expectations.Helpers {
-  implicit protected def effectCompat               = MonixBIOUnsafeRun
-  final implicit protected def scheduler: Scheduler = effectCompat.scheduler
-  def getSuite: EffectSuite[Task]                   = this
+  implicit protected def effectCompat = MonixBIOUnsafeRun
+  final implicit protected def scheduler: Scheduler =
+    MonixBIOUnsafeRun.scheduler
+  def getSuite: EffectSuite[Task] = this
 }
diff --git a/modules/framework/monix-bio/test/src/weaver/monixbiocompat/IOSuiteTest.scala b/modules/framework/monix-bio/test/src/weaver/monixbiocompat/IOSuiteTest.scala
@@ -5,7 +5,7 @@ import cats.effect.Resource
 import weaver.framework.{ DogFood, MonixBIO }
 
 import monix.bio.Task
-import sbt.testing.Status
+import sbt.testing.Status.{ Error, Failure }
 
 object IOSuiteTest extends MutableIOSuite {
   override type Res = DogFood[Task]
@@ -25,7 +25,7 @@ object IOSuiteTest extends MutableIOSuite {
           else None
         }
         val maybeStatus = maybeEvent.map(_.status())
-        expect(maybeStatus.contains(Status.Error)) &&
+        expect(maybeStatus.contains(Error)) &&
         expect(maybeThrowable.map(_.getMessage).contains("oh no"))
       }
     }
@@ -35,7 +35,7 @@ object IOSuiteTest extends MutableIOSuite {
     dogfood.runSuite(TestWithFailedExpectation).map { case (_, events) =>
       val maybeEvent  = events.headOption
       val maybeStatus = maybeEvent.map(_.status())
-      expect(maybeStatus.contains(Status.Failure))
+      expect(maybeStatus.contains(Failure))
     }
   }
 

diff --git a/modules/framework/monix/test/src/weaver/monixcompat/TaskSuiteTest.scala b/modules/framework/monix/test/src/weaver/monixcompat/TaskSuiteTest.scala
@@ -5,7 +5,7 @@ import cats.effect.Resource
 import weaver.framework.{ DogFood, Monix }
 
 import monix.eval.Task
-import sbt.testing.Status
+import sbt.testing.Status.{ Error, Failure }
 
 object TaskSuiteTest extends MutableTaskSuite {
 
@@ -28,7 +28,7 @@ object TaskSuiteTest extends MutableTaskSuite {
         val maybeStatus = maybeEvent.map(_.status())
 
         expect.all(
-          maybeStatus.contains(Status.Error),
+          maybeStatus.contains(Error),
           maybeThrowable.map(_.getMessage).contains("oh no")
         )
 
@@ -40,7 +40,7 @@ object TaskSuiteTest extends MutableTaskSuite {
     dogfood.runSuite(TestWithFailedExpectation).map { case (_, events) =>
       val maybeEvent  = events.headOption
       val maybeStatus = maybeEvent.map(_.status())
-      expect(maybeStatus.contains(Status.Failure))
+      expect(maybeStatus.contains(Failure))
     }
   }