Skip to content

Commit

Permalink
use scala 2.13.12
Browse files Browse the repository at this point in the history
  • Loading branch information
bjaglin committed Sep 7, 2023
1 parent 3da6acd commit 3637ed9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions bin/test-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.18:$version \
ch.epfl.scala:scalafix-reflect_2.13.11:$version \
ch.epfl.scala:scalafix-reflect_2.13.12:$version \
ch.epfl.scala:scalafix-cli_2.12.18:$version \
ch.epfl.scala:scalafix-cli_2.13.11:$version \
ch.epfl.scala:scalafix-cli_2.13.12:$version \
ch.epfl.scala:scalafix-testkit_2.12.18:$version \
ch.epfl.scala:scalafix-testkit_2.13.11:$version \
ch.epfl.scala:scalafix-testkit_2.13.12:$version \
-r sonatype:public
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import scala.util.Try

object Dependencies {
val scala212 = "2.12.18"
val scala213 = "2.13.11"
val scala213 = "2.13.12"
val scala3 = "3.3.1-RC7"

val buildScalaVersions = Seq(scala212, scala213, scala3)
Expand Down
1 change: 1 addition & 0 deletions project/ScalafixBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
)

private val PreviousScalaVersion: Map[String, String] = Map(
"2.13.12" -> "2.13.11"
)

override def buildSettings: Seq[Setting[_]] = List(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ class RuleCompiler(
List(new BatchSourceFile(label, new String(input.chars)))
)
val errors = reporter.infos.collect {
case reporter.Info(pos, msg, reporter.ERROR) =>
case r: reporter.Info if r.severity == reporter.ERROR =>
ConfError
.message(msg)
.message(r.msg)
.atPos(
if (pos.isDefined) Position.Range(input, pos.start, pos.end)
if (r.pos.isDefined) Position.Range(input, r.pos.start, r.pos.end)
else Position.None
)
.notOk
Expand Down

0 comments on commit 3637ed9

Please sign in to comment.