Skip to content

Commit

Permalink
Exclude the macrotask executor and add it as an explicit dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
vasilmkd committed Sep 9, 2021
1 parent a0ac396 commit 526fdb4
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,31 @@ lazy val core = crossProject(JSPlatform, JVMPlatform)
.in(file("core"))
.settings(docsSettings)
.settings(
name := "discipline-specs2"
name := "discipline-specs2",
libraryDependencies += "org.typelevel" %%% "discipline-core" % disciplineV
)
.settings(
libraryDependencies += "org.typelevel" %%% "discipline-core" % disciplineV,
.jvmSettings(
libraryDependencies += {
if (isDotty.value)
("org.specs2" %%% "specs2-scalacheck" % specs2V)
.cross(CrossVersion.for3Use2_13)
.exclude("org.scalacheck", "scalacheck_2.13")
.exclude("org.scalacheck", "scalacheck_sjs1_2.13")
else
"org.specs2" %%% "specs2-scalacheck" % specs2V
}
)
.jsSettings(
libraryDependencies += {
if (isDotty.value)
("org.specs2" %%% "specs2-scalacheck" % specs2V)
.cross(CrossVersion.for3Use2_13)
.exclude("org.scalacheck", "scalacheck_sjs1_2.13")
.exclude("org.scala-js", "scala-js-macrotask-executor_sjs1_2.13")
else
"org.specs2" %%% "specs2-scalacheck" % specs2V
},
libraryDependencies += "org.scala-js" %%% "scala-js-macrotask-executor" % macrotaskExecutorV
)

lazy val coreJVM = core.jvm
lazy val coreJS = core.js
Expand All @@ -112,6 +123,7 @@ lazy val docs = project

val disciplineV = "1.1.5"
val specs2V = "4.12.12"
val macrotaskExecutorV = "0.1.0"

// General Settings
lazy val docsSettings = Seq(
Expand Down

0 comments on commit 526fdb4

Please sign in to comment.