Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Scala3 3.0.0-M1 #412

Merged
merged 1 commit into from
Nov 4, 2020
Merged

Add support for Scala3 3.0.0-M1 #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
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
1 change: 1 addition & 0 deletions bin/test-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ coursier fetch \
org.scalameta:mdoc_2.11:$version \
org.scalameta:mdoc_2.12:$version \
org.scalameta:mdoc_2.13:$version \
org.scalameta:mdoc_3.0.0-M1:$version \
org.scalameta:mdoc-js_2.11:$version \
org.scalameta:mdoc-js_2.12:$version \
org.scalameta:mdoc-js_2.13:$version $suffix
Expand Down
9 changes: 5 additions & 4 deletions build.sbt
View file
Open in desktop
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
View file
Open in desktop
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