Skip to content

Commit 2f14f13

Browse files
authored
Merge pull request #1984 from bjaglin/21314
build and test against Scala 2.13.14
2 parents 0ff4441 + 6e969d0 commit 2f14f13

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

bin/test-release.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ cs resolve \
88
ch.epfl.scala:scalafix-core_2.12:$version \
99
ch.epfl.scala:scalafix-core_2.13:$version \
1010
ch.epfl.scala:scalafix-reflect_2.12.19:$version \
11-
ch.epfl.scala:scalafix-reflect_2.13.13:$version \
11+
ch.epfl.scala:scalafix-reflect_2.13.14:$version \
1212
ch.epfl.scala:scalafix-cli_2.12.19:$version \
13-
ch.epfl.scala:scalafix-cli_2.13.13:$version \
13+
ch.epfl.scala:scalafix-cli_2.13.14:$version \
1414
ch.epfl.scala:scalafix-testkit_2.12.19:$version \
15-
ch.epfl.scala:scalafix-testkit_2.13.13:$version \
15+
ch.epfl.scala:scalafix-testkit_2.13.14:$version \
1616
-r sonatype:public

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import sbt._
66

77
object Dependencies {
88
val scala212 = sys.props.getOrElse("scala212.nightly", "2.12.19")
9-
val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.13")
9+
val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.14")
1010
val scala3 = sys.props.getOrElse("scala3.nightly", "3.4.1")
1111

1212
val bijectionCoreV = "0.9.7"

project/ScalafixBuild.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
5151
}
5252
.filterNot { v =>
5353
System.getProperty("java.version").startsWith("22") &&
54-
Seq("2.12.17", "2.12.18", "2.13.11", "2.13.12").contains(v)
54+
Seq("2.12.17", "2.12.18", "2.13.12").contains(v)
5555
}
5656
}
5757

@@ -229,6 +229,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
229229
)
230230

231231
private val PreviousScalaVersion: Map[String, String] = Map(
232+
"2.13.14" -> "2.13.13"
232233
)
233234

234235
override def buildSettings: Seq[Setting[_]] = List(

scalafix-cli/src/main/scala/scalafix/internal/v1/Args.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,12 +468,10 @@ object Args extends TPrintImplicits {
468468
.toList
469469
)
470470
}
471-
// scalafix:off RemoveUnused; false positive in 2.13.13
472471
implicit val classLoaderDecoder: ConfDecoder[URLClassLoader] =
473472
ConfDecoder[Classpath].map(ClasspathOps.toClassLoader)
474473
implicit val absolutePathDecoder: ConfDecoder[AbsolutePath] =
475474
ConfDecoder.stringConfDecoder.map(AbsolutePath(_)(base.cwd))
476-
// scalafix:on
477475
generic.deriveDecoder(base)
478476
}
479477

0 commit comments

Comments
 (0)