From 669055b46e3b128873552b1b01ea375aa7dbc181 Mon Sep 17 00:00:00 2001 From: Lorenzo Gabriele Date: Sat, 15 May 2021 17:03:22 +0200 Subject: [PATCH] Support Scala 3.0.0 --- build.sc | 10 +++++----- mill | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sc b/build.sc index a6272a0..bdbe81f 100644 --- a/build.sc +++ b/build.sc @@ -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) @@ -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( @@ -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 diff --git a/mill b/mill index cc56cc8..4754fd0 100755 --- a/mill +++ b/mill @@ -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