Skip to content

Commit

Permalink
[BE2] remove scapegoat
Browse files Browse the repository at this point in the history
  • Loading branch information
Louis Bettens committed Jun 30, 2022
1 parent 8629dbe commit 387a32e
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 13 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,6 @@ jobs:
- name: Report coverage
run: sbt coverageReport

- name: Run static analysis (ScapeGoat)
run: sbt scapegoat

- name: Run Sonar scanner
env:
SONAR_HOST_URL: https://sonarcloud.io
Expand Down
9 changes: 0 additions & 9 deletions be2-scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ scalacOptions ++= Seq(
"-Ycache-macro-class-loader:last-modified", // and macro definitions. This can lead to performance improvements.
)

Scapegoat/ scalacOptions -= "-Xfatal-warnings"
// Temporarily report scapegoat errors as warnings, to avoid broken builds
Scapegoat/ scalacOptions += "-P:scapegoat:overrideLevels:all=Warning"

// Reload changes automatically
Global / onChangedBuildSource := ReloadOnSourceChanges
Global / cancelable := true
Expand Down Expand Up @@ -95,10 +91,6 @@ lazy val scoverageSettings = Seq(
packageBin/ coverageEnabled := false,
)

ThisBuild/ scapegoatVersion := "1.4.11"

scapegoatReports := Seq("xml", "html")

// Configure Sonar
sonarProperties := Map(
"sonar.organization" -> "dedis",
Expand All @@ -111,7 +103,6 @@ sonarProperties := Map(
"sonar.scala.version" -> "2.13.7",
// Paths to the test and coverage reports
"sonar.scala.coverage.reportPaths" -> "./target/scala-2.13/scoverage-report/scoverage.xml",
"sonar.scala.scapegoat.reportPaths" -> "./target/scala-2.13/scapegoat-report/scapegoat.xml"
)

assembly/ assemblyMergeStrategy := {
Expand Down
1 change: 0 additions & 1 deletion be2-scala/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.1")
addSbtPlugin("com.sonar-scala" % "sbt-sonar" % "2.3.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")
addSbtPlugin("com.rallyhealth.sbt" % "sbt-git-versioning" % "1.6.0")
Expand Down

0 comments on commit 387a32e

Please sign in to comment.