From c8bf70916645768e1bc198f2a494c696f0e0c726 Mon Sep 17 00:00:00 2001 From: Johan Date: Thu, 26 Sep 2024 22:07:19 +0700 Subject: [PATCH] feat: Support Scala 2.12.20, 2.13.15, 3.3.3, 3.5.1 out of the box (#188) --- .github/workflows/pr-checks.yml | 2 +- project/build.properties | 2 +- .../scala/com/sksamuel/scapegoat/sbt/ScapegoatSbtPlugin.scala | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 6973bdd..bdc0c1b 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -10,7 +10,7 @@ jobs: matrix: java: [8] sbt: - - 1.10.1 + - 1.10.2 - 0.13.18 steps: - uses: actions/checkout@v4 diff --git a/project/build.properties b/project/build.properties index ee4c672..0b699c3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.1 +sbt.version=1.10.2 diff --git a/src/main/scala/com/sksamuel/scapegoat/sbt/ScapegoatSbtPlugin.scala b/src/main/scala/com/sksamuel/scapegoat/sbt/ScapegoatSbtPlugin.scala index 64cd0d2..aedbf83 100644 --- a/src/main/scala/com/sksamuel/scapegoat/sbt/ScapegoatSbtPlugin.scala +++ b/src/main/scala/com/sksamuel/scapegoat/sbt/ScapegoatSbtPlugin.scala @@ -127,7 +127,9 @@ object ScapegoatSbtPlugin extends AutoPlugin { val selectedScapegoatVersion = (scapegoatVersion ?).value.getOrElse { scalaVersion.value match { // To give a better out of the box experience, default to a recent version of Scapegoat for known Scala versions - case "2.13.14" | "2.13.13" | "2.12.19" | "2.12.18" => "2.1.6" + case "3.3.3" | "3.5.1" | "2.13.14" | "2.13.15" | "2.12.19" | "2.12.20" => "3.0.2" + case "3.4.2" => "3.0.0" + case "2.13.13" | "2.12.18" => "2.1.6" case "2.13.12" => "2.1.5" case "2.13.11" | "2.12.17" => "2.1.4" case "2.13.10" => "2.1.2"