Merge pull request #1984 from bjaglin/21314

build and test against Scala 2.13.14
scalacenter · Apr 30, 2024 · 2f14f13 · 2f14f13
2 parents 0ff4441 + 6e969d0
commit 2f14f13
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/bin/test-release.sh b/bin/test-release.sh
@@ -8,9 +8,9 @@ cs resolve \
   ch.epfl.scala:scalafix-core_2.12:$version  \
   ch.epfl.scala:scalafix-core_2.13:$version  \
   ch.epfl.scala:scalafix-reflect_2.12.19:$version  \
-  ch.epfl.scala:scalafix-reflect_2.13.13:$version  \
+  ch.epfl.scala:scalafix-reflect_2.13.14:$version  \
   ch.epfl.scala:scalafix-cli_2.12.19:$version  \
-  ch.epfl.scala:scalafix-cli_2.13.13:$version  \
+  ch.epfl.scala:scalafix-cli_2.13.14:$version  \
   ch.epfl.scala:scalafix-testkit_2.12.19:$version \
-  ch.epfl.scala:scalafix-testkit_2.13.13:$version \
+  ch.epfl.scala:scalafix-testkit_2.13.14:$version \
   -r sonatype:public
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,7 +6,7 @@ import sbt._
 
 object Dependencies {
   val scala212 = sys.props.getOrElse("scala212.nightly", "2.12.19")
-  val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.13")
+  val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.14")
   val scala3 = sys.props.getOrElse("scala3.nightly", "3.4.1")
 
   val bijectionCoreV = "0.9.7"

diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala
@@ -51,7 +51,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
               }
               .filterNot { v =>
                 System.getProperty("java.version").startsWith("22") &&
-                Seq("2.12.17", "2.12.18", "2.13.11", "2.13.12").contains(v)
+                Seq("2.12.17", "2.12.18", "2.13.12").contains(v)
               }
           }
 
@@ -229,6 +229,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
   )
 
   private val PreviousScalaVersion: Map[String, String] = Map(
+    "2.13.14" -> "2.13.13"
   )
 
   override def buildSettings: Seq[Setting[_]] = List(

diff --git a/scalafix-cli/src/main/scala/scalafix/internal/v1/Args.scala b/scalafix-cli/src/main/scala/scalafix/internal/v1/Args.scala
@@ -468,12 +468,10 @@ object Args extends TPrintImplicits {
             .toList
         )
       }
-    // scalafix:off RemoveUnused; false positive in 2.13.13
     implicit val classLoaderDecoder: ConfDecoder[URLClassLoader] =
       ConfDecoder[Classpath].map(ClasspathOps.toClassLoader)
     implicit val absolutePathDecoder: ConfDecoder[AbsolutePath] =
       ConfDecoder.stringConfDecoder.map(AbsolutePath(_)(base.cwd))
-    // scalafix:on
     generic.deriveDecoder(base)
   }