Update Scala to 2.13.12 and apply follow-up fixes

takari · Nov 3, 2023 · 25672ca · 25672ca
1 parent 531f90c
commit 25672ca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/polyglot-scala/pom.xml b/polyglot-scala/pom.xml
@@ -20,8 +20,8 @@
   <name>Polyglot :: Scala</name>
 
   <properties>
-    <scala.version>2.12.18</scala.version>
-    <scala.bin.version>2.12</scala.bin.version>
+    <scala.version>2.13.12</scala.version>
+    <scala.bin.version>2.13</scala.bin.version>
   </properties>
 
   <contributors>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.scala-lang.modules</groupId>
       <artifactId>scala-xml_${scala.bin.version}</artifactId>
-      <version>1.0.6</version>
+      <version>2.2.0</version>
     </dependency>
 
     <dependency>

diff --git a/polyglot-scala/src/main/scala/org/sonatype/maven/polyglot/scala/ScalaModelWriter.scala b/polyglot-scala/src/main/scala/org/sonatype/maven/polyglot/scala/ScalaModelWriter.scala
@@ -42,7 +42,7 @@ object ScalaPrettyPrinter extends PrettyPrinter {
   }
 
   def mapStrings(m: Map[String, String]): Doc = {
-    "Map" <> lparen <> nest(lsep(m.map(me => dquotes(me._1) <+> "->" <+> dquotes(me._2)).to[immutable.Seq], comma)) <@> rparen
+    "Map" <> lparen <> nest(lsep(m.map(me => dquotes(me._1) <+> "->" <+> dquotes(me._2)).toSeq, comma)) <@> rparen
   }
 
   def seqString(s: immutable.Seq[String]): Doc = "Seq" <> lparen <> nest(lsep(s.map(dquotes(_)), comma)) <@> rparen

diff --git a/polyglot-scala/src/main/scala/org/sonatype/maven/polyglot/scala/eval/Eval.scala b/polyglot-scala/src/main/scala/org/sonatype/maven/polyglot/scala/eval/Eval.scala
@@ -464,7 +464,7 @@ class Eval(target: Option[File]) {
     val target = compilerOutputDir
 
     trait MessageCollector {
-      val messages: Seq[List[String]]
+      val messages: mutable.Seq[List[String]]
       val counts: Map[_root_.scala.reflect.internal.Reporter.Severity, AtomicInteger]
     }