Merge pull request #69 from playframework/remove_scapegoat

Removing scapegoat in order to fix a scala-xml dependency issue.

.github/workflows/scala.yml

@@ -35,9 +35,6 @@ jobs:
       #- id: czc3c36wxhuvscex
       #  name: Validating Code Formatting
       #  run: sbt clean scalariformFormat test:scalariformFormat
-      - id: beyvek5dzffcpr7p
-        name: Static Code Check
-        run: sbt scapegoat
       - id: eyv27ug23k32wwde
         name: Checking Dependencies for Known Vulnerabilities
         run: sbt clean dependencyCheckAggregate

build.sbt

@@ -49,7 +49,6 @@ ThisBuild / publishTo := {
   }
 }
 ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
-ThisBuild / scapegoatVersion := "2.1.3"
 
 dependencyCheckAssemblyAnalyzerEnabled := Some(false)
 dependencyCheckFormat := "ALL"
@@ -93,8 +92,7 @@ lazy val root = (project in file("."))
     publish / skip := true,
     publishLocal := {},
     publishM2 := {},
-    publishArtifact := false,
-    scapegoatDisabledInspections := Seq("AsInstanceOf", "BooleanParameter", "ComparingUnrelatedTypes", "FinalModifierOnCaseClass", "MethodNames")
+    publishArtifact := false
   )
 
 lazy val silhouette = (project in file("silhouette"))
@@ -115,8 +113,7 @@ lazy val silhouette = (project in file("silhouette"))
         Library.scalaGuice % Test,
         Library.akkaTestkit % Test
       ),
-    resolvers ++= Dependencies.resolvers,
-    scapegoatDisabledInspections := Seq("AsInstanceOf", "BooleanParameter", "ComparingUnrelatedTypes", "FinalModifierOnCaseClass", "MethodNames")
+    resolvers ++= Dependencies.resolvers
   )
   .enablePlugins(PlayScala)
 
@@ -134,8 +131,7 @@ lazy val silhouetteCas = (project in file("silhouette-cas"))
         Library.Specs2.matcherExtra % Test,
         Library.Specs2.mock % Test,
         Library.scalaGuice % Test
-      ),
-    scapegoatDisabledInspections := Seq("AsInstanceOf", "BooleanParameter", "ComparingUnrelatedTypes", "FinalModifierOnCaseClass", "MethodNames")
+      )
   )
   .dependsOn(silhouette % "compile->compile;test->test")
 
@@ -148,8 +144,7 @@ lazy val silhouetteTotp = (project in file("silhouette-totp"))
       Library.updates ++ Seq(
         Library.googleAuth,
         Library.Play.specs2 % Test
-      ),
-    scapegoatDisabledInspections := Seq("AsInstanceOf", "BooleanParameter", "ComparingUnrelatedTypes", "FinalModifierOnCaseClass", "MethodNames")
+      )
   )
   .dependsOn(silhouette % "compile->compile;test->test")
 
@@ -164,8 +159,7 @@ lazy val silhouetteCryptoJca = (project in file("silhouette-crypto-jca"))
         Library.commonsCodec,
         Library.Specs2.core % Test,
         Library.Specs2.matcherExtra % Test
-      ),
-    scapegoatDisabledInspections := Seq("AsInstanceOf", "BooleanParameter", "ComparingUnrelatedTypes", "FinalModifierOnCaseClass", "MethodNames")
+      )
   )
   .dependsOn(silhouette)
 
@@ -178,8 +172,7 @@ lazy val silhouetteArgon2 = (project in file("silhouette-password-argon2"))
       Library.updates ++ Seq(
         Library.argon2,
         Library.Specs2.core % Test
-      ),
-    scapegoatDisabledInspections := Seq("AsInstanceOf", "BooleanParameter", "ComparingUnrelatedTypes", "FinalModifierOnCaseClass", "MethodNames")
+      )
   )
   .dependsOn(silhouette)
 
@@ -192,8 +185,7 @@ lazy val silhouetteBcrypt = (project in file("silhouette-password-bcrypt"))
       Library.updates ++ Seq(
         Library.jbcrypt,
         Library.Specs2.core % Test
-      ),
-    scapegoatDisabledInspections := Seq("AsInstanceOf", "BooleanParameter", "ComparingUnrelatedTypes", "FinalModifierOnCaseClass", "MethodNames")
+      )
   )
   .dependsOn(silhouette)
 
@@ -210,8 +202,7 @@ lazy val silhouettePersistence = (project in file("silhouette-persistence"))
         Library.Specs2.matcherExtra % Test,
         Library.Specs2.mock % Test,
         Library.scalaGuice % Test
-      ),
-    scapegoatDisabledInspections := Seq("AsInstanceOf", "BooleanParameter", "ComparingUnrelatedTypes", "FinalModifierOnCaseClass", "MethodNames")
+      )
   )
   .dependsOn(silhouette)
 
@@ -229,8 +220,7 @@ lazy val silhouetteTestkit = (project in file("silhouette-testkit"))
         Library.Specs2.mock % Test,
         Library.scalaGuice % Test,
         Library.akkaTestkit % Test
-      ),
-    scapegoatDisabledInspections := Seq("AsInstanceOf", "BooleanParameter", "ComparingUnrelatedTypes", "FinalModifierOnCaseClass", "MethodNames")
+      )
   )
   .enablePlugins(PlayScala)
   .dependsOn(silhouette)
@@ -242,7 +232,6 @@ releaseCrossBuild        := true
 releaseNextCommitMessage := s"Setting version to ${(ThisBuild / version).value}"
 releaseProcess := Seq[ReleaseStep](
   runClean,
-  releaseStepTask(scapegoat),
   releaseStepTask(dependencyCheckAggregate),
   releaseStepTask(dependencyUpdates),
   checkSnapshotDependencies,

project/plugins.sbt

@@ -2,7 +2,6 @@ addSbtPlugin(dependency = "ch.epfl.scala" % "sbt-version-policy" % "2.1.3")
 addSbtPlugin(dependency = "com.github.sbt" % "sbt-release" % "1.1.0")
 addSbtPlugin(dependency = "com.github.sbt" % "sbt-unidoc" % "0.5.0")
 addSbtPlugin(dependency = "com.jsuereth" % "sbt-pgp" % "2.1.1")
-addSbtPlugin(dependency = "com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.2")
 addSbtPlugin(dependency = "com.timushev.sbt" % "sbt-updates" % "0.6.4")
 addSbtPlugin(dependency = "com.typesafe.play" % "sbt-plugin" % "2.9.0")
 addSbtPlugin(dependency = "net.vonbuchholtz" % "sbt-dependency-check" % "4.0.0")