build with and test against Scala 2.12.20 & 2.13.15

scalacenter · Sep 23, 2024 · 5ea23a4 · 5ea23a4
1 parent 9dbf075
commit 5ea23a4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/.github/scripts/update.sc b/.github/scripts/update.sc
@@ -4,7 +4,7 @@
 //
 // /!\ Run it from the repository root directory!
 
-//> using scala "2.12.17"
+//> using scala "2.12.20"
 //> using lib "com.softwaremill.sttp::core:1.5.10"
 //> using lib "com.lihaoyi::upickle:2.0.0"
 //> using lib "com.github.tototoshi::scala-csv:1.3.5"

diff --git a/bin/test-release.sh b/bin/test-release.sh
@@ -3,8 +3,8 @@ set -eux
 
 version=$1
 
-scala212=2.12.19
-scala213=2.13.14
+scala212=2.12.20
+scala213=2.13.15
 scala3LTS=3.3.4-RC1
 scala3Next=3.5.1
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -5,8 +5,8 @@ import sbt._
 /* scalafmt: { maxColumn = 140 }*/
 
 object Dependencies {
-  val scala212 = sys.props.getOrElse("scala212.nightly", "2.12.19")
-  val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.14")
+  val scala212 = sys.props.getOrElse("scala212.nightly", "2.12.20")
+  val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.15")
   val scala3Next = sys.props.getOrElse("scala3.nightly", "3.5.1")
   val scala3LTS = "3.3.4-RC3"
 
@@ -20,7 +20,7 @@ object Dependencies {
   val metaconfigV = "0.13.0"
   val nailgunV = "0.9.1"
   val scalaXmlV = "2.2.0"
-  val scalametaV = "4.9.9+138-31ec8cdb-SNAPSHOT"
+  val scalametaV = "4.9.9+172-2d284c2b-SNAPSHOT"
   val scalatestV = "3.2.19"
   val munitV = "1.0.2"
 

diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala
@@ -47,13 +47,9 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
                 .getOrElse(Nil)
             previousPatchVersions
               .map { patch => s"$binaryVersion.$patch" }
-              .filterNot { v =>
-                System.getProperty("java.version").startsWith("21") &&
-                Seq("2.12.17").contains(v)
-              }
               .filterNot { v =>
                 System.getProperty("java.version").startsWith("22") &&
-                Seq("2.12.17", "2.12.18", "2.13.12").contains(v)
+                Seq("2.12.18").contains(v)
               }
           }
 
@@ -233,6 +229,8 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
   )
 
   private val PreviousScalaVersion: Map[String, String] = Map(
+    "2.12.20" -> "2.12.19",
+    "2.13.15" -> "2.13.14"
   )
 
   override def buildSettings: Seq[Setting[_]] = List(