Skip to content

Commit 6d19aa6

Browse files
authored
Merge pull request #65 from com-lihaoyi/support-scala-3
Support Scala 3.0.0
2 parents 05fc94d + 669055b commit 6d19aa6

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

build.sc

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import de.tobiasroeser.mill.vcs.version.VcsVersion
55

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

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

1111
val scalaJSVersions = for {
1212
scalaV <- scalaVersions
13-
scalaJSV <- Seq("0.6.33", "1.4.0")
13+
scalaJSV <- Seq("0.6.33", "1.5.1")
1414
if scalaV.startsWith("2.") || scalaJSV.startsWith("1.")
1515
} yield (scalaV, scalaJSV)
1616

@@ -41,8 +41,8 @@ trait PPrintModule extends PublishModule {
4141
trait PPrintMainModule extends CrossScalaModule {
4242
def millSourcePath = super.millSourcePath / offset
4343
def ivyDeps = Agg(
44-
ivy"com.lihaoyi::fansi::0.2.13",
45-
ivy"com.lihaoyi::sourcecode::0.2.6"
44+
ivy"com.lihaoyi::fansi::0.2.14",
45+
ivy"com.lihaoyi::sourcecode::0.2.7"
4646
)
4747
def compileIvyDeps =
4848
if (crossScalaVersion.startsWith("2")) Agg(
@@ -99,7 +99,7 @@ trait PPrintMainModule extends CrossScalaModule {
9999
trait PPrintTestModule extends ScalaModule with TestModule {
100100
def crossScalaVersion: String
101101
def testFrameworks = Seq("utest.runner.Framework")
102-
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.7.9")
102+
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.7.10")
103103
def offset: os.RelPath = os.rel
104104
def millSourcePath = super.millSourcePath / os.up
105105

mill

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This is a wrapper script, that automatically download mill from GitHub release pages
44
# You can give the required mill version with MILL_VERSION env variable
55
# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
6-
DEFAULT_MILL_VERSION=0.9.5-52-ef6d5d
6+
DEFAULT_MILL_VERSION=0.9.7
77

88
set -e
99

0 commit comments

Comments
 (0)