scala 2.13.9

scalacenter · Sep 20, 2022 · 7c158ed · 7c158ed
1 parent e78910b
commit 7c158ed
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/bin/test-release.sh b/bin/test-release.sh
@@ -10,11 +10,11 @@ cs resolve \
   ch.epfl.scala:scalafix-core_2.13:$version  \
   ch.epfl.scala:scalafix-reflect_2.11.12:$version  \
   ch.epfl.scala:scalafix-reflect_2.12.17:$version  \
-  ch.epfl.scala:scalafix-reflect_2.13.8:$version  \
+  ch.epfl.scala:scalafix-reflect_2.13.9:$version  \
   ch.epfl.scala:scalafix-cli_2.11.12:$version  \
   ch.epfl.scala:scalafix-cli_2.12.17:$version  \
-  ch.epfl.scala:scalafix-cli_2.13.8:$version  \
+  ch.epfl.scala:scalafix-cli_2.13.9:$version  \
   ch.epfl.scala:scalafix-testkit_2.11.12:$version  \
   ch.epfl.scala:scalafix-testkit_2.12.17:$version \
-  ch.epfl.scala:scalafix-testkit_2.13.8:$version \
+  ch.epfl.scala:scalafix-testkit_2.13.9:$version \
   -r sonatype:public
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -9,7 +9,7 @@ import scala.util.Try
 object Dependencies {
   val scala211 = "2.11.12"
   val scala212 = "2.12.17"
-  val scala213 = "2.13.8"
+  val scala213 = "2.13.9"
   val scala3 = "3.1.3"
 
   val buildScalaVersions = Seq(scala211, scala212, scala213)

diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala
@@ -58,8 +58,9 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
       else Nil
     }
     lazy val targetJvm = Def.setting {
-      if (isScala3.value) "-Xtarget:8"
-      else "-target:jvm-1.8"
+      if (isScala3.value) Seq("-Xtarget:8")
+      else if (isScala213.value) Seq("-release", "8")
+      else Seq("-target:jvm-1.8")
     }
     val warnAdaptedArgs = Def.setting {
       if (isScala3.value) Nil
@@ -83,8 +84,8 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
     }
     lazy val compilerOptions = Def.setting(
       warnUnusedImports.value ++
+        targetJvm.value ++
         Seq(
-          targetJvm.value,
           "-encoding",
           "UTF-8",
           "-feature",
@@ -177,6 +178,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
   )
 
   private val PreviousScalaVersion: Map[String, String] = Map(
+    "2.13.9" -> "2.13.8"
   )
 
   override def buildSettings: Seq[Setting[_]] = List(

diff --git a/scalafix-tests/unit/src/main/resources/expect/Pretty.expect b/scalafix-tests/unit/src/main/resources/expect/Pretty.expect
@@ -111,7 +111,7 @@
 [116:12..116:22]: test/Test.C#ByNameType. => final object ByNameType extends AnyRef { +1 decls }
 [117:11..117:13]: test/Test.C#ByNameType.m1(). => method m1(x: => Int): Int
 [117:14..117:15]: test/Test.C#ByNameType.m1().(x) => param x: => Int
-[120:16..120:28]: test/Test.C#RepeatedType# => case class RepeatedType extends AnyRef with Product with Serializable { +12 decls }
+[120:16..120:28]: test/Test.C#RepeatedType# => case class RepeatedType extends AnyRef with Product with Serializable { +11 decls }
 [120:28..120:28]: test/Test.C#RepeatedType#`<init>`(). => primary ctor <init>(val s: String*)
 [120:29..120:30]: test/Test.C#RepeatedType#s. => val method s: String*
 [121:11..121:13]: test/Test.C#RepeatedType#m1(). => method m1(x: Int*): Int