Skip to content

Commit 259b45f

Browse files
committed
Upgrade scala patch versions to support jdk 21
1 parent 67f302d commit 259b45f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

build.mill

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
99
import $ivy.`com.github.lolgab::mill-mima::0.0.23`
1010
import de.tobiasroeser.mill.vcs.version.VcsVersion
1111

12-
val scala213 = "2.13.10"
13-
val scala212 = "2.12.17"
12+
val scala213 = "2.13.15"
13+
val scala212 = "2.12.20"
1414
val scala3 = "3.3.4"
15-
val scalaJS = "1.13.0"
15+
val scalaJS = "1.17.0"
1616
val communityBuildDottyVersion = sys.props.get("dottyVersion").toList
1717

1818
val scalaVersions = List(scala212, scala213, scala3) ++ communityBuildDottyVersion
@@ -43,9 +43,9 @@ trait CaskMainModule extends CaskModule {
4343
Agg.when(!isScala3)(ivy"org.scala-lang:scala-reflect:$crossScalaVersion")
4444
}
4545

46-
def compileIvyDeps = Agg.when(!isScala3)(ivy"com.lihaoyi:::acyclic:0.3.6")
46+
def compileIvyDeps = Agg.when(!isScala3)(ivy"com.lihaoyi:::acyclic:0.3.15")
4747
def scalacOptions = Agg.when(!isScala3)("-P:acyclic:force").toSeq
48-
def scalacPluginIvyDeps = Agg.when(!isScala3)(ivy"com.lihaoyi:::acyclic:0.3.6")
48+
def scalacPluginIvyDeps = Agg.when(!isScala3)(ivy"com.lihaoyi:::acyclic:0.3.15")
4949

5050
object test extends ScalaTests with TestModule.Utest{
5151
def ivyDeps = Agg(

example/twirl/package.mill

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ trait AppModule extends CrossScalaModule with mill.twirllib.TwirlModule{
66

77
def moduleDeps = Seq(build.cask(crossScalaVersion))
88

9-
def twirlScalaVersion = "2.13.10"
10-
def twirlVersion = "1.5.1"
9+
def twirlScalaVersion = "2.13.15"
10+
def twirlVersion = "1.6.8"
1111

1212
def generatedSources = T{ Seq(compileTwirl().classes) }
1313
def ivyDeps = Agg[Dep](

0 commit comments

Comments
 (0)