Skip to content

Commit

Permalink
feat: Support Scala 2.12.20 and 3.5.0 (#869)
Browse files Browse the repository at this point in the history
* feat: Support Scala 2.12.20 and 3.5.0

* fix(ci): Align CI versions with project build
  • Loading branch information
Johnnei authored Sep 13, 2024
1 parent 54f98ad commit 559aa96
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:
matrix:
java: ['8', '11']
scala:
- 2.12.18
- 2.12.19
- 2.12.20
- 2.13.13
- 2.13.14
- 3.3.3
- 3.4.2
- 3.5.0
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ developers := List(
)
)

scalaVersion := "3.4.2"
crossScalaVersions := Seq("2.12.18", "2.12.19", "2.13.13", "2.13.14", "3.3.3", "3.4.2")
scalaVersion := "3.5.0"
crossScalaVersions := Seq("2.12.19", "2.12.20", "2.13.13", "2.13.14", "3.3.3", "3.5.0")
autoScalaLibrary := false
crossVersion := CrossVersion.full
crossTarget := {
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resolvers += Classpaths.sbtPluginReleases
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")

if (System.getProperty("add-scapegoat-plugin") == "true")
Expand Down
1 change: 0 additions & 1 deletion src/main/scala-3/com/sksamuel/scapegoat/Plugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class ScapegoatPhase(var configuration: Configuration, override val inspections:
extends PluginPhase
with ScapegoatBasePlugin {

import tpd.*

private[scapegoat] var feedback: Option[FeedbackDotty] = None

Expand Down

0 comments on commit 559aa96

Please sign in to comment.