Merge pull request #194 from typelevel/js-warnings

Silence JS warnings for CE 2
typelevel · Mar 5, 2022 · 0b75458 · 0b75458
2 parents 3fe3e15 + dc5da65
commit 0b75458
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -67,6 +67,7 @@ lazy val ce2 = crossProject(JSPlatform, JVMPlatform)
     Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/jvm/src/test/scala"
   )
   .jsSettings(
+    libraryDependencies += "org.scala-js" %%% "scala-js-macrotask-executor" % "1.0.0",
     Compile / unmanagedSourceDirectories += baseDirectory.value / "../../common/js/src/main/scala",
     Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/js/src/test/scala",
     scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))

diff --git a/ce2/js/src/main/scala/munit/CatsEffectSuitePlatform.scala b/ce2/js/src/main/scala/munit/CatsEffectSuitePlatform.scala
@@ -17,9 +17,14 @@
 package munit
 
 import cats.effect.IO
+import org.scalajs.macrotaskexecutor.MacrotaskExecutor
+
+import scala.concurrent.ExecutionContext
 
 private[munit] trait CatsEffectSuitePlatform { self: CatsEffectSuite =>
 
   private[munit] def unsafeRunSyncOrForget[A](ioa: IO[A]): Unit = ioa.unsafeRunAsyncAndForget()
 
+  private[munit] def suiteExecutionContext: ExecutionContext = MacrotaskExecutor
+
 }
diff --git a/ce2/jvm/src/main/scala/munit/CatsEffectSuitePlatform.scala b/ce2/jvm/src/main/scala/munit/CatsEffectSuitePlatform.scala
@@ -18,11 +18,15 @@ package munit
 
 import cats.effect.IO
 
+import scala.concurrent.ExecutionContext
+
 private[munit] trait CatsEffectSuitePlatform { self: CatsEffectSuite =>
 
   private[munit] def unsafeRunSyncOrForget[A](ioa: IO[A]): Unit = {
     ioa.unsafeRunSync()
     ()
   }
 
+  private[munit] def suiteExecutionContext: ExecutionContext = ExecutionContext.global
+
 }
diff --git a/ce2/shared/src/main/scala/munit/CatsEffectSuite.scala b/ce2/shared/src/main/scala/munit/CatsEffectSuite.scala
@@ -27,11 +27,13 @@ abstract class CatsEffectSuite
     with CatsEffectFixtures
     with CatsEffectFunFixtures {
 
+  private val ec: ExecutionContext = suiteExecutionContext
+
   implicit def munitContextShift: ContextShift[IO] =
-    IO.contextShift(ExecutionContext.global)
+    IO.contextShift(ec)
 
   implicit def munitTimer: Timer[IO] =
-    IO.timer(ExecutionContext.global)
+    IO.timer(ec)
 
   override def munitValueTransforms: List[ValueTransform] =
     super.munitValueTransforms ++ List(munitIOTransform, munitSyncIOTransform)