Skip to content

Commit

Permalink
Merge pull request #2183 from bjaglin/scala335
Browse files Browse the repository at this point in the history
build and test against Scala 3.3.5
  • Loading branch information
bjaglin authored Jan 31, 2025
2 parents f206131 + d21f24a commit b81dc4a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions bin/test-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ version=$1

scala212=2.12.20
scala213=2.13.16
scala3LTS=3.3.4
scala3Next=3.6.2
scala3LTS=3.3.5
scala3Next=3.6.3

cs resolve \
ch.epfl.scala:scalafix-interfaces:$version \
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import sbt._
object Dependencies {
val scala212 = sys.props.getOrElse("scala212.nightly", "2.12.20")
val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.16")
val scala33 = "3.3.4"
val scala33 = "3.3.5"
val scala35 = "3.5.2"
val scala36 = "3.6.3"
val scala3LTS = scala33
Expand Down
9 changes: 6 additions & 3 deletions project/ScalafixBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -243,13 +243,16 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
)

private val PreviousScalaVersion: Map[String, Option[String]] = Map(
"3.3.5" -> Some("3.3.4"),
"3.6.3" -> Some("3.6.2")
)

override def buildSettings: Seq[Setting[_]] = List(
// removed from the compiler in 2.13.16 & 3.6.3, extremely unlikely to be needed by clients
versionPolicyIgnored += "net.java.dev.jna" % "jna",
versionPolicyIgnored += "org.jline" % "jline-terminal-jna",
// removed from the compiler in 2.13.16, 3.3.4 & 3.6.3, extremely unlikely to be needed by clients
versionPolicyIgnored ++= Seq(
"net.java.dev.jna" % "jna",
"org.jline" % "jline-terminal-jna"
),
// https://github.com/sbt/sbt/issues/5568#issuecomment-1094380636
versionPolicyIgnored ++= Seq(
// https://github.com/scalacenter/scalafix/pull/1530
Expand Down

0 comments on commit b81dc4a

Please sign in to comment.