Skip to content

Commit

Permalink
Update Scala 3 to 3.0.0
Browse files Browse the repository at this point in the history
- Bump utest to 0.7.10
- Bump Scala.js to 1.5.1
- Bump Mill to 0.9.6-61-bd7927
  • Loading branch information
lolgab committed May 13, 2021
1 parent b190d0a commit 0c2ba0b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
10 changes: 4 additions & 6 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ val dottyCustomVersion = sys.props.get("dottyVersion")
val scala211 = "2.11.12"
val scala212 = "2.12.13"
val scala213 = "2.13.4"
val scala3 = "3.0.0-RC3"
val scala3 = "3.0.0"

val scalaVersions = scala213 :: scala212 :: scala211 :: scala3 :: dottyCustomVersion.toList
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 @@ -48,12 +48,10 @@ trait Common extends CrossScalaModule {
def sources = T.sources(millSourcePath / "src")
}

trait CommonTestModule extends ScalaModule with TestModule {
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.7.9")
def testFrameworks = Seq("utest.runner.Framework")
trait CommonTestModule extends ScalaModule with TestModule.Utest {
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.7.10")
}


object geny extends Module {
object jvm extends Cross[JvmGenyModule](scalaVersions: _*)
class JvmGenyModule(val crossScalaVersion: String)
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.6-61-bd7927

set -e

Expand Down

0 comments on commit 0c2ba0b

Please sign in to comment.