Skip to content

Commit d2acc16

Browse files
Update Scala to 2.13.12 (#1375)
2 parents 151446c + e97838b commit d2acc16

File tree

4 files changed

+53
-6
lines changed

4 files changed

+53
-6
lines changed

.github/workflows/actions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
java-version: [8, 11]
17-
scala-version: [2.12.18, 2.13.11, 3.3.0]
17+
scala-version: [2.12.18, 2.13.12, 3.3.0]
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
java-version: [8, 11]
32-
scala-version: [2.12.18, 2.13.11, 3.3.0]
32+
scala-version: [2.12.18, 2.13.12, 3.3.0]
3333
runs-on: ubuntu-latest
3434
steps:
3535
- uses: actions/checkout@v2
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package ammonite.compiler
2+
3+
import ammonite.util.Classpath
4+
5+
import scala.reflect.internal.util.{CodeAction, Position}
6+
import scala.reflect.io.FileZipArchive
7+
import scala.tools.nsc
8+
import scala.tools.nsc.classpath.{AggregateClassPath, ZipAndJarClassPathFactory}
9+
import scala.tools.nsc.{Global, Settings}
10+
import scala.tools.nsc.interactive.{InteractiveAnalyzer, Global => InteractiveGlobal}
11+
import scala.tools.nsc.plugins.Plugin
12+
import scala.tools.nsc.reporters.FilteringReporter
13+
import scala.tools.nsc.typechecker.Analyzer
14+
15+
object MakeReporter {
16+
17+
type Reporter = scala.tools.nsc.reporters.Reporter
18+
19+
def makeReporter(errorLogger: (Position, String) => Unit,
20+
warningLogger: (Position, String) => Unit,
21+
infoLogger: (Position, String) => Unit,
22+
outerSettings: Settings): Reporter =
23+
new FilteringReporter {
24+
25+
override
26+
def doReport(pos: scala.reflect.internal.util.Position,
27+
msg: String,
28+
severity: Severity,
29+
actions: List[CodeAction]): Unit =
30+
display(pos, msg, severity)
31+
32+
def display(pos: Position, msg: String, severity: Severity) =
33+
severity match{
34+
case ERROR =>
35+
Classpath.traceClasspathProblem(s"ERROR: $msg")
36+
errorLogger(pos, msg)
37+
case WARNING =>
38+
warningLogger(pos, msg)
39+
case INFO =>
40+
infoLogger(pos, msg)
41+
}
42+
43+
def settings = outerSettings
44+
}
45+
}

build.sc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ val cross2_3Version = (scala3Ver: String) =>
4747

4848

4949
val scala2_12Versions = Seq("2.12.8", "2.12.9", "2.12.10", "2.12.11", "2.12.12", "2.12.13", "2.12.14", "2.12.15", "2.12.16", "2.12.17", "2.12.18")
50-
val scala2_13Versions = Seq("2.13.0", "2.13.1", "2.13.2", "2.13.3", "2.13.4", "2.13.5", "2.13.6", "2.13.7", "2.13.8", "2.13.9", "2.13.10", "2.13.11")
50+
val scala2_13Versions = Seq("2.13.0", "2.13.1", "2.13.2", "2.13.3", "2.13.4", "2.13.5", "2.13.6", "2.13.7", "2.13.8", "2.13.9", "2.13.10", "2.13.11", "2.13.12")
5151
val scala31Versions = Seq("3.1.0", "3.1.1", "3.1.2", "3.1.3")
5252
val scala32Versions = Seq("3.2.0", "3.2.1", "3.2.2")
5353
val scala33Versions = Seq("3.3.0")
@@ -80,7 +80,7 @@ val fastparseVersion = "3.0.0"
8080
val scalametaVersion = "4.8.5"
8181

8282
object Deps {
83-
val acyclic = ivy"com.lihaoyi:::acyclic:0.3.8"
83+
val acyclic = ivy"com.lihaoyi:::acyclic:0.3.9"
8484
val bsp4j = ivy"ch.epfl.scala:bsp4j:${bspVersion}"
8585
val bcprovJdk15on = ivy"org.bouncycastle:bcprov-jdk15on:1.56"
8686
val cask = ivy"com.lihaoyi::cask:0.6.0"
@@ -273,8 +273,10 @@ trait AmmInternalModule extends CrossSbtModule with Bloop.Module{
273273
val extraDir3 =
274274
if (isScala2()) {
275275
val dir =
276-
if (sv.startsWith("2.13.") && sv != "2.13.0")
277-
millSourcePath / "src" / "main" / "scala-2.13.1+"
276+
if (sv.startsWith("2.13.") && sv.stripPrefix("2.13.").toInt >= 1 && sv.stripPrefix("2.13.").toInt <= 11)
277+
millSourcePath / "src" / "main" / "scala-2.13.1-2.13.11"
278+
else if (sv.startsWith("2.13.") && sv.stripPrefix("2.13.").toInt >= 12)
279+
millSourcePath / "src" / "main" / "scala-2.13.12+"
278280
else if (sv.startsWith("2.12.") && sv.stripPrefix("2.12.").toInt >= 13)
279281
millSourcePath / "src" / "main" / "scala-2.12.13+"
280282
else

0 commit comments

Comments
 (0)