From 5ca0a8819f9718f1a2f14888f889f05cb8768327 Mon Sep 17 00:00:00 2001 From: Johnnei Date: Thu, 12 Sep 2024 20:57:58 +0700 Subject: [PATCH 1/2] feat: Support Scala 2.12.20 and 3.5.0 --- build.sbt | 4 ++-- project/plugins.sbt | 2 +- src/main/scala-3/com/sksamuel/scapegoat/Plugin.scala | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 24ed42c8..4861de27 100644 --- a/build.sbt +++ b/build.sbt @@ -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 := { diff --git a/project/plugins.sbt b/project/plugins.sbt index 4a89115c..cef4d56b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") diff --git a/src/main/scala-3/com/sksamuel/scapegoat/Plugin.scala b/src/main/scala-3/com/sksamuel/scapegoat/Plugin.scala index 5af777d6..c082c59f 100644 --- a/src/main/scala-3/com/sksamuel/scapegoat/Plugin.scala +++ b/src/main/scala-3/com/sksamuel/scapegoat/Plugin.scala @@ -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 From 62e4f84d857b7ba1809e2eb5cf6039813472dc1a Mon Sep 17 00:00:00 2001 From: Johnnei Date: Fri, 13 Sep 2024 21:34:06 +0700 Subject: [PATCH 2/2] fix(ci): Align CI versions with project build --- .github/workflows/pr-checks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 1540bdb3..330feb95 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -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