Skip to content

Commit

Permalink
Merge pull request #424 from tgodzik/update-to-3.0.0-M2
Browse files Browse the repository at this point in the history
Add support for Scala 3.0.0-M2
  • Loading branch information
tgodzik authored Nov 25, 2020
2 parents edbb0ac + bf01c29 commit ee3cdcc
Show file tree
Hide file tree
Showing 5 changed files with 135 additions and 144 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- "'++2.11.12 test'"
- "'++2.12.11 test' scripted"
- "'++2.13.2 test'"
- "'++3.0.0-M1 test'"
- "'++3.0.0-M2 test'"
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v10
Expand Down
7 changes: 5 additions & 2 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("3.0.0-M1")
def scala3 = List("3.0.0-M2")

def scalajs = "1.3.0"
def scalajsBinaryVersion = "1"
Expand Down Expand Up @@ -110,7 +110,7 @@ lazy val sharedSettings = List(

val V = new {
val scalameta = "4.4.0"
val munit = "0.7.18"
val munit = "0.7.19"
val coursier = "1.0.2"
val scalacheck = "1.15.1"
}
Expand Down Expand Up @@ -151,6 +151,9 @@ lazy val runtime = project
"com.lihaoyi" %% "pprint" % pprintVersion.value,
"org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
"org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided
),
if3 = List(
"org.scala-lang" %% "scala3-compiler" % scalaVersion.value
)
)
)
Expand Down
Loading

0 comments on commit ee3cdcc

Please sign in to comment.