Skip to content

Commit ae8efdc

Browse files
author
James Santucci
committed
wip -- stashing to compare with main
1 parent ee35a77 commit ae8efdc

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

build.sbt

+5-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ addCommandAlias(
99
"ci-test",
1010
";scalafmtCheckAll; scalafmtSbtCheck; +test; +publishLocal; sbt-exercise/scripted"
1111
)
12+
1213
addCommandAlias("ci-docs", ";github; mdoc; headerCreateAll")
1314
addCommandAlias("ci-publish", ";github; ci-release")
1415

@@ -51,9 +52,8 @@ lazy val compiler = (project in file("compiler"))
5152
crossScalaVersions := Seq(V.scala, V.scala212),
5253
scalacOptions -= "-Xfatal-warnings",
5354
libraryDependencies ++= Seq(
54-
"org.scala-exercises" %% "runtime" % V.runtime,
55+
"org.scala-exercises" %% "runtime" % V.runtime exclude ("org.scala-lang.modules", "scala-collection-compat"),
5556
"org.scala-lang" % "scala-compiler" % scalaVersion.value,
56-
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
5757
"org.scala-lang.modules" %% "scala-xml" % V.scalaXml,
5858
"org.typelevel" %% "cats-core" % V.cats % Compile,
5959
"org.http4s" %% "http4s-blaze-client" % V.http4s,
@@ -66,7 +66,9 @@ lazy val compiler = (project in file("compiler"))
6666
"org.typelevel" %% "cats-effect-kernel" % V.catsEffect,
6767
"org.scalatest" %% "scalatest-core" % V.scalatest % Test,
6868
"org.scalatest" %% "scalatest" % V.scalatest % Test
69-
),
69+
) ++ (if (scalaVersion.value == V.scala)
70+
Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value)
71+
else Seq.empty),
7072
dependencyOverrides += "org.scala-lang.modules" %% "scala-xml" % "2.0.1",
7173
unusedCompileDependenciesFilter -= moduleFilter("org.scala-lang", "scala-compiler")
7274
)

0 commit comments

Comments
 (0)