Update to Scala 3.0.0 (#36)

* Update to Scala 3.0.0 * Bump Mill, Utest, Scala.js and use TestModule.Utest Co-authored-by: Lorenzo Gabriele <[email protected]>
com-lihaoyi · May 15, 2021 · 2f6d4a3 · 2f6d4a3
1 parent 2d2a15d
commit 2f6d4a3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/build.sc b/build.sc
@@ -4,12 +4,12 @@ import de.tobiasroeser.mill.vcs.version.VcsVersion
 
 val dottyVersions = sys.props.get("dottyVersion").toList
 
-val scalaVersions = "2.11.12" :: "2.12.13" :: "2.13.4" :: "3.0.0-RC3" :: dottyVersions
+val scalaVersions = "2.11.12" :: "2.12.13" :: "2.13.4" :: "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)
 
@@ -39,7 +39,7 @@ trait FansiModule extends PublishModule {
 }
 trait FansiMainModule extends CrossScalaModule {
   def millSourcePath = super.millSourcePath / offset
-  def ivyDeps = Agg(ivy"com.lihaoyi::sourcecode::0.2.6")
+  def ivyDeps = Agg(ivy"com.lihaoyi::sourcecode::0.2.7")
   def offset: os.RelPath = os.rel
   def sources = T.sources(
     super.sources()
@@ -53,10 +53,9 @@ trait FansiMainModule extends CrossScalaModule {
 }
 
 
-trait FansiTestModule extends ScalaModule with TestModule {
+trait FansiTestModule extends ScalaModule with TestModule.Utest {
   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
@@ -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
 

diff --git a/readme.md b/readme.md
@@ -250,6 +250,10 @@ Scaladoc
 Changelog
 ---------
 
+### 0.2.14
+
+- Support for Scala 3.0.0
+
 ### 0.2.12
 
 - Support for Scala 3.0.0-RC2