Skip to content

Commit

Permalink
Merge pull request #65 from com-lihaoyi/support-scala-3
Browse files Browse the repository at this point in the history
Support Scala 3.0.0
  • Loading branch information
lolgab authored May 15, 2021
2 parents 05fc94d + 669055b commit 6d19aa6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import de.tobiasroeser.mill.vcs.version.VcsVersion

val dottyVersions = sys.props.get("dottyVersion").toList

val scalaVersions = "2.12.13" :: "2.13.4" :: "2.11.12" :: "3.0.0-RC3" :: dottyVersions
val scalaVersions = "2.12.13" :: "2.13.4" :: "2.11.12" :: "3.0.0" :: dottyVersions
val scala2Versions = scalaVersions.filter(_.startsWith("2."))

val scalaJSVersions = for {
scalaV <- scalaVersions
scalaJSV <- Seq("0.6.33", "1.4.0")
scalaJSV <- Seq("0.6.33", "1.5.1")
if scalaV.startsWith("2.") || scalaJSV.startsWith("1.")
} yield (scalaV, scalaJSV)

Expand Down Expand Up @@ -41,8 +41,8 @@ trait PPrintModule extends PublishModule {
trait PPrintMainModule extends CrossScalaModule {
def millSourcePath = super.millSourcePath / offset
def ivyDeps = Agg(
ivy"com.lihaoyi::fansi::0.2.13",
ivy"com.lihaoyi::sourcecode::0.2.6"
ivy"com.lihaoyi::fansi::0.2.14",
ivy"com.lihaoyi::sourcecode::0.2.7"
)
def compileIvyDeps =
if (crossScalaVersion.startsWith("2")) Agg(
Expand Down Expand Up @@ -99,7 +99,7 @@ trait PPrintMainModule extends CrossScalaModule {
trait PPrintTestModule extends ScalaModule with TestModule {
def crossScalaVersion: String
def testFrameworks = Seq("utest.runner.Framework")
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.7.9")
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.7.10")
def offset: os.RelPath = os.rel
def millSourcePath = super.millSourcePath / os.up

Expand Down
2 changes: 1 addition & 1 deletion mill
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This is a wrapper script, that automatically download mill from GitHub release pages
# You can give the required mill version with MILL_VERSION env variable
# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
DEFAULT_MILL_VERSION=0.9.5-52-ef6d5d
DEFAULT_MILL_VERSION=0.9.7

set -e

Expand Down

0 comments on commit 6d19aa6

Please sign in to comment.