Skip to content

Commit 0d5f36b

Browse files
committed
Issue #631 - Scala.js support is broken - effectie-cats-effect3 for Scala.js is done
1 parent d535d97 commit 0d5f36b

81 files changed

Lines changed: 18520 additions & 11848 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build.sbt

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ProjectInfo._
1+
import ProjectInfo.*
22
import just.semver.{Anh, Dsv, SemVer}
33
import SemVer.{Major, Minor, Patch}
44
import just.semver.AdditionalInfo.PreRelease
@@ -333,6 +333,9 @@ lazy val catsEffect3Js = catsEffect3
333333
.js
334334
.settings(jsSettingsForFuture)
335335
.settings(jsSettings)
336+
.settings(
337+
libraryDependencies ++= List(libs.tests.munitCatsEffect3.value)
338+
)
336339

337340
lazy val monix3 = module(ProjectName("monix3"), crossProject(JVMPlatform, JSPlatform))
338341
.settings(
@@ -420,7 +423,7 @@ addCommandAlias(
420423
)
421424

422425
def getTheLatestTaggedVersion(): String = {
423-
import sys.process._
426+
import sys.process.*
424427
"git fetch --tags".!
425428
val tag = "git rev-list --tags --max-count=1".!!.trim
426429
s"git describe --tags $tag".!!.trim.stripPrefix("v")
@@ -484,6 +487,8 @@ lazy val props =
484487

485488
val MunitVersion = "0.7.29"
486489

490+
val MunitCatsEffectVersion = "1.0.7"
491+
487492
final val catsVersion = "2.7.0"
488493

489494
final val catsEffect2Version = "2.4.1"
@@ -555,6 +560,9 @@ lazy val libs =
555560
Def.setting("org.scala-js" %%% "scala-js-macrotask-executor" % props.ScalaJsMacrotaskExecutorVersion % Test)
556561

557562
lazy val munit = Def.setting("org.scalameta" %%% "munit" % props.MunitVersion % Test)
563+
564+
lazy val munitCatsEffect3 =
565+
Def.setting("org.typelevel" %%% "munit-cats-effect-3" % props.MunitCatsEffectVersion % Test)
558566
}
559567
}
560568

@@ -668,7 +676,11 @@ def module(projectName: ProjectName, crossProject: CrossProject.Builder): CrossP
668676
)
669677
}
670678

671-
lazy val jsSettingsForFuture: SettingsDefinition = List.empty
679+
lazy val jsSettingsForFuture: SettingsDefinition = List(
680+
libraryDependencies ++= List(
681+
libs.tests.scalaJsMacrotaskExecutor.value
682+
)
683+
)
672684
//lazy val jsSettingsForFuture: SettingsDefinition = List(
673685
// Test / scalacOptions ++= (if (scalaVersion.value.startsWith("3")) List.empty
674686
// else List("-P:scalajs:nowarnGlobalExecutionContext")),
@@ -680,7 +692,4 @@ lazy val jsSettings: SettingsDefinition = List(
680692
crossScalaVersions := props.CrossScalaVersions.filterNot(_.startsWith("2.12")),
681693
Test / fork := false,
682694
coverageEnabled := false,
683-
libraryDependencies ++= List(
684-
libs.tests.scalaJsMacrotaskExecutor.value
685-
),
686695
)

0 commit comments

Comments
 (0)