Skip to content

Commit

Permalink
Add support for Scala3 3.0.0-M1
Browse files Browse the repository at this point in the history
  • Loading branch information
tgodzik committed Nov 4, 2020
1 parent 2d61305 commit ae03753
Show file tree
Hide file tree
Showing 7 changed files with 107 additions and 1,570 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ jobs:
- "'++2.11.12 test'"
- "'++2.12.11 test' scripted"
- "'++2.13.2 test'"
- "'++0.26.0 test'"
- "'++0.27.0-RC1 test'"
- "'++3.0.0-M1 test'"
steps:
- uses: actions/checkout@v1
- uses: olafurpg/setup-scala@v7
Expand Down
9 changes: 5 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import scala.collection.mutable
def scala212 = "2.12.12"
def scala211 = "2.11.12"
def scala213 = "2.13.3"
def scala3 = List("0.26.0", "0.27.0-RC1")
def scala3 = List("3.0.0-M1")

def scalajs = "1.1.1"
def scalajsBinaryVersion = "1"
Expand All @@ -20,7 +20,8 @@ val isScala213 = Def.setting {
}

val isScala3 = Def.setting {
VersionNumber(scalaVersion.value).matchesSemVer(SemanticSelector("<=1.0.0 || >=3.0.0"))
// doesn't work well with >= 3.0.0 for `3.0.0-M1`
VersionNumber(scalaVersion.value).matchesSemVer(SemanticSelector("<=1.0.0 || >=2.99.0"))
}

val isScalaJs1 = Def.setting {
Expand Down Expand Up @@ -109,7 +110,7 @@ lazy val sharedSettings = List(

val V = new {
val scalameta = "4.3.24"
val munit = "0.7.14"
val munit = "0.7.16"
val coursier = "1.0.1"
}

Expand Down Expand Up @@ -180,7 +181,7 @@ lazy val mdoc = project
libraryDependencies ++= crossSetting(
scalaVersion.value,
if3 = List(
"ch.epfl.lamp" %% "dotty-compiler" % scalaVersion.value,
"org.scala-lang" %% "scala3-compiler" % scalaVersion.value,
("org.scalameta" %% "scalameta" % V.scalameta)
.excludeAll(excludePprint)
.withDottyCompat(scalaVersion.value),
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.1.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.18.0")
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.4")
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.5")

libraryDependencies ++= List(
"org.jsoup" % "jsoup" % "1.12.1",
Expand Down
Loading

0 comments on commit ae03753

Please sign in to comment.