Skip to content

Commit

Permalink
Merge pull request #1932 from bjaglin/scalareleases
Browse files Browse the repository at this point in the history
Bump all Scala versions (2.12.19, 2.13.13, 3.4.0)
  • Loading branch information
bjaglin authored Feb 24, 2024
2 parents dab2b49 + ba05ca5 commit a005e01
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 11 deletions.
12 changes: 6 additions & 6 deletions bin/test-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ cs resolve \
ch.epfl.scala:scalafix-interfaces:$version \
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.12:$version \
ch.epfl.scala:scalafix-cli_2.12.18:$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.12:$version \
ch.epfl.scala:scalafix-reflect_2.12.19:$version \
ch.epfl.scala:scalafix-reflect_2.13.13:$version \
ch.epfl.scala:scalafix-cli_2.12.19:$version \
ch.epfl.scala:scalafix-cli_2.13.13:$version \
ch.epfl.scala:scalafix-testkit_2.12.19:$version \
ch.epfl.scala:scalafix-testkit_2.13.13:$version \
-r sonatype:public
1 change: 0 additions & 1 deletion docs/developers/semantic-type.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ scope

```scala mdoc
import scalafix.v1._
import scala.meta._
```

```scala mdoc:passthrough
Expand Down
2 changes: 1 addition & 1 deletion docs/developers/symbol-matcher.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ pattern.

```scala mdoc
doc.tree.traverse {
case function @ Term.Apply.After_4_6_0(successObject(_), List(argument)) =>
case function @ Term.Apply.After_4_6_0(successObject(_), Term.ArgClause(List(argument), _)) =>
println(function.pos.formatMessage("info",
s"Argument of Success is $argument"))
}
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import sbt._
/* scalafmt: { maxColumn = 120 }*/

object Dependencies {
val scala212 = sys.props.getOrElse("scala212.nightly", "2.12.18")
val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.12")
val scala3 = sys.props.getOrElse("scala3.nightly", "3.4.0-RC2")
val scala212 = sys.props.getOrElse("scala212.nightly", "2.12.19")
val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.13")
val scala3 = sys.props.getOrElse("scala3.nightly", "3.4.0")

val bijectionCoreV = "0.9.7"
val collectionCompatV = "2.11.0"
Expand Down
2 changes: 2 additions & 0 deletions project/ScalafixBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
)

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

override def buildSettings: Seq[Setting[_]] = List(
Expand Down
2 changes: 2 additions & 0 deletions scalafix-cli/src/main/scala/scalafix/internal/v1/Args.scala
Original file line number Diff line number Diff line change
Expand Up @@ -466,10 +466,12 @@ 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)
}

Expand Down

0 comments on commit a005e01

Please sign in to comment.