From a38c2e2501ecef442d08d11179aa465c0b2b8417 Mon Sep 17 00:00:00 2001 From: CircleCI Date: Sun, 14 Jun 2020 17:45:56 +0000 Subject: [PATCH 001/142] Setting version to 8.5.0-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index bda9009e..d93832fc 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "8.4.0" +version in ThisBuild := "8.5.0-SNAPSHOT" From f98bbcfedc569d106a09757c4d3245543a848ad2 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sun, 14 Jun 2020 18:46:13 +0100 Subject: [PATCH 002/142] Update readme. --- README.md | 4 ++-- vars.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4c2c8cd0..34b03c6a 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ [![bintray-badge-lts-67]][bintray-lts-67] [![bintray-stats-badge]][bintray-stats] [![gitter-badge]][gitter] -[bintray]: https://bintray.com/mwz/maven/sonar-scala/8.3.0/link -[bintray-badge]: https://img.shields.io/badge/Download-8.3.0-blue.svg +[bintray]: https://bintray.com/mwz/maven/sonar-scala/8.4.0/link +[bintray-badge]: https://img.shields.io/badge/Download-8.4.0-blue.svg [bintray-badge-lts]: https://img.shields.io/badge/Download-7.9.0_(for_SonarQube_7.9_LTS)-blue.svg [bintray-badge-lts-67]: diff --git a/vars.json b/vars.json index 0a2dd930..da53bcc6 100644 --- a/vars.json +++ b/vars.json @@ -1,5 +1,5 @@ { - "version": "8.3.0", + "version": "8.4.0", "ltsVersion": "7.9.0", "lts67Version": "6.8.0" } From 6531113f9e574bc6d986a82c90a3bd67809a9b47 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 21:31:27 +0200 Subject: [PATCH 003/142] Update scalafmt-core to 2.7.1 (#514) [ci skip] --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index e8772426..b2979fba 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "2.5.3" +version = "2.7.1" align = some align { arrowEnumeratorGenerator = false From 5c258c8a730f0acd574c6faef8ed2a092583884a Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 21:31:53 +0200 Subject: [PATCH 004/142] Update sbt-scalafix to 0.9.20 (#510) [ci skip] --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index ddb01213..1bbacdb5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,5 +8,5 @@ addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") addSbtPlugin("com.github.mwz" % "sbt-sonar" % "2.1.1") addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.10") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.17") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.20") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0") From e76e898ba32cdcfef04b7b36dd854a8e8202dc0a Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 21:36:39 +0200 Subject: [PATCH 005/142] Update scalameta to 4.3.22 (#513) [ci skip] --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index f36acb9d..693f75d6 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -4,7 +4,7 @@ libraryDependencies ++= Seq( // Scapegoat & scalastyle inspections generator dependencies "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.4", "com.beautiful-scala" %% "scalastyle" % "1.4.0", - "org.scalameta" %% "scalameta" % "4.3.15", + "org.scalameta" %% "scalameta" % "4.3.22", "org.scalatest" %% "scalatest" % "3.1.2" % Test ) From e53b2bc0822da2b541e4a5a24d9e4bcef209ebfa Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 21:38:09 +0200 Subject: [PATCH 006/142] Update sbt to 1.3.13 (#485) [ci skip] --- examples/sbt/multi-module/project/build.properties | 2 +- examples/sbt/single-module/project/build.properties | 2 +- project/build.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sbt/multi-module/project/build.properties b/examples/sbt/multi-module/project/build.properties index 654fe70c..0837f7a1 100644 --- a/examples/sbt/multi-module/project/build.properties +++ b/examples/sbt/multi-module/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.12 +sbt.version=1.3.13 diff --git a/examples/sbt/single-module/project/build.properties b/examples/sbt/single-module/project/build.properties index 654fe70c..0837f7a1 100644 --- a/examples/sbt/single-module/project/build.properties +++ b/examples/sbt/single-module/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.12 +sbt.version=1.3.13 diff --git a/project/build.properties b/project/build.properties index 654fe70c..0837f7a1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.12 +sbt.version=1.3.13 From 07b2f1f9968312f04415f2266fdbabdab56bdd53 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 21:38:33 +0200 Subject: [PATCH 007/142] Update sbt-tpolecat to 0.1.13 (#484) [ci skip] --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1bbacdb5..1c2e2c39 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.12") +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.13") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13") From 05e0fa2e0feb57b7ec77de2188f9967406da7c3b Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 21:38:57 +0200 Subject: [PATCH 008/142] Update mockito-scala to 1.14.8 (#480) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e4189dd8..f1e26883 100644 --- a/build.sbt +++ b/build.sbt @@ -80,7 +80,7 @@ libraryDependencies ++= List( "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5" % Test, "org.http4s" %% "http4s-blaze-server" % http4s % Test, "org.http4s" %% "http4s-dsl" % http4s % Test, - "org.mockito" %% "mockito-scala" % "1.14.4" % Test, + "org.mockito" %% "mockito-scala" % "1.14.8" % Test, "org.scalacheck" %% "scalacheck" % "1.14.3" % Test, "org.scalatest" %% "scalatest" % "3.1.2" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, From a6cfa7389e379d97e09bbaaf7486f9e03ad42b89 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 21:39:19 +0200 Subject: [PATCH 009/142] Update cats-effect to 2.1.4 (#495) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f1e26883..ad576a58 100644 --- a/build.sbt +++ b/build.sbt @@ -73,7 +73,7 @@ libraryDependencies ++= List( "org.slf4j" % "slf4j-api" % "1.7.30" % Provided, "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, "org.typelevel" %% "cats-core" % "2.1.1", - "org.typelevel" %% "cats-effect" % "2.1.3", + "org.typelevel" %% "cats-effect" % "2.1.4", "org.typelevel" %% "mouse" % "0.25", // TEST "com.beachape" %% "enumeratum-scalacheck" % "1.6.1" % Test, From bad465ec6112be26c4ea43c0ba18fe2c72d7f2c5 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 21:41:12 +0200 Subject: [PATCH 010/142] Update sbt-sonar to 2.2.0 (#490) [ci skip] --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1c2e2c39..832f5ce2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13") addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") -addSbtPlugin("com.github.mwz" % "sbt-sonar" % "2.1.1") +addSbtPlugin("com.github.mwz" % "sbt-sonar" % "2.2.0") addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.10") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.20") From 5e868f2abe86a5054204f2a2b1a060eefb6c236e Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 21:41:39 +0200 Subject: [PATCH 011/142] Update sbt-scalafmt to 2.4.2 (#501) [ci skip] Co-authored-by: Michael Wizner --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 832f5ce2..e92dfa22 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,4 +9,4 @@ addSbtPlugin("com.github.mwz" % "sbt-sonar" % "2.2.0") addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.10") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.20") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") From 49867c57810d8d2b4203f96553c4922215cdc6d0 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 21:42:14 +0200 Subject: [PATCH 012/142] Update diffx-scalatest to 0.3.29 (#473) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ad576a58..70588e16 100644 --- a/build.sbt +++ b/build.sbt @@ -85,7 +85,7 @@ libraryDependencies ++= List( "org.scalatest" %% "scalatest" % "3.1.2" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, "org.scalatestplus" %% "scalacheck-1-14" % "3.1.2.0" % Test, - "com.softwaremill.diffx" %% "diffx-scalatest" % "0.3.28" % Test, + "com.softwaremill.diffx" %% "diffx-scalatest" % "0.3.29" % Test, "org.sonarsource.sonarqube" % "sonar-plugin-api-impl" % sonarVersion % Test ) From c61fab550656b975243a0bfb0aee00731a8277de Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 21:49:41 +0200 Subject: [PATCH 013/142] Update http4s-blaze-client, ... to 0.21.7 (#504) [ci skip] Co-authored-by: Michael Wizner --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 70588e16..3795c726 100644 --- a/build.sbt +++ b/build.sbt @@ -57,7 +57,7 @@ sourceGenerators in Compile ++= Seq( // Lib dependencies val sonarVersion = "8.3.0.34182" val circe = "0.13.0" -val http4s = "0.21.4" +val http4s = "0.21.7" libraryDependencies ++= List( "com.beachape" %% "enumeratum" % "1.6.1", "com.beachape" %% "enumeratum-cats" % "1.6.1", From f90229f82c4ec4e18fdee983fc1e1ce83f3de519 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 21:51:37 +0200 Subject: [PATCH 014/142] Update sbt-assembly to 0.15.0 (#479) [ci skip] Co-authored-by: Michael Wizner --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e92dfa22..fd76c8c9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.13") -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13") addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6") From 5f681cbd73181f58a73f199aca5bd11324e14b38 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Wed, 16 Sep 2020 21:36:53 +0100 Subject: [PATCH 015/142] Update scalatest to 3.2 (#516) Co-authored-by: Michael Wizner Co-authored-by: Scala Steward Co-authored-by: Scala Steward <43047562+scala-steward@users.noreply.github.com> --- build.sbt | 4 ++-- examples/sbt/multi-module/build.sbt | 2 +- examples/sbt/single-module/build.sbt | 2 +- project/build.sbt | 2 +- .../src/test/scala/ScalastyleInspectionsGeneratorTest.scala | 5 +++-- .../src/test/scala/ScapegoatInspectionsGeneratorSpec.scala | 6 ++++-- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index 3795c726..5c16a1be 100644 --- a/build.sbt +++ b/build.sbt @@ -82,9 +82,9 @@ libraryDependencies ++= List( "org.http4s" %% "http4s-dsl" % http4s % Test, "org.mockito" %% "mockito-scala" % "1.14.8" % Test, "org.scalacheck" %% "scalacheck" % "1.14.3" % Test, - "org.scalatest" %% "scalatest" % "3.1.2" % Test, + "org.scalatest" %% "scalatest" % "3.2.0" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, - "org.scalatestplus" %% "scalacheck-1-14" % "3.1.2.0" % Test, + "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test, "com.softwaremill.diffx" %% "diffx-scalatest" % "0.3.29" % Test, "org.sonarsource.sonarqube" % "sonar-plugin-api-impl" % sonarVersion % Test ) diff --git a/examples/sbt/multi-module/build.sbt b/examples/sbt/multi-module/build.sbt index a4756882..40b6f2f8 100644 --- a/examples/sbt/multi-module/build.sbt +++ b/examples/sbt/multi-module/build.sbt @@ -1,6 +1,6 @@ lazy val baseSettings = Seq( scalaVersion := "2.12.8", - libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % "test", + libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.0" % "test", scapegoatVersion in ThisBuild := "1.3.9" ) diff --git a/examples/sbt/single-module/build.sbt b/examples/sbt/single-module/build.sbt index c95cb8be..01f63913 100644 --- a/examples/sbt/single-module/build.sbt +++ b/examples/sbt/single-module/build.sbt @@ -1,4 +1,4 @@ name := "sbt-single-module" scalaVersion := "2.12.8" -libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % "test" +libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.0" % "test" scapegoatVersion in ThisBuild := "1.3.9" diff --git a/project/build.sbt b/project/build.sbt index 693f75d6..0c82374d 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -5,7 +5,7 @@ libraryDependencies ++= Seq( "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.4", "com.beautiful-scala" %% "scalastyle" % "1.4.0", "org.scalameta" %% "scalameta" % "4.3.22", - "org.scalatest" %% "scalatest" % "3.1.2" % Test + "org.scalatest" %% "scalatest" % "3.2.0" % Test ) // Adding a resolver to the Artima maven repo, so sbt can download the Artima SuperSafe sbt plugin diff --git a/project/src/test/scala/ScalastyleInspectionsGeneratorTest.scala b/project/src/test/scala/ScalastyleInspectionsGeneratorTest.scala index 029a4fd8..7934388b 100644 --- a/project/src/test/scala/ScalastyleInspectionsGeneratorTest.scala +++ b/project/src/test/scala/ScalastyleInspectionsGeneratorTest.scala @@ -19,13 +19,14 @@ package com.mwz.sonar.scala.metadata.scalastyle import com.typesafe.config.ConfigFactory import org.scalastyle._ -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers import scala.io.Source.fromResource import scala.meta._ import scala.xml._ -class ScalastyleInspectionsGeneratorTest extends FlatSpec with Matchers { +class ScalastyleInspectionsGeneratorTest extends AnyFlatSpec with Matchers { "extractInspections" should "successfully extract the inspections" in { val inspections = XML.load(fromResource("scalastyle/definition.xml").bufferedReader()) \\ "checker" diff --git a/project/src/test/scala/ScapegoatInspectionsGeneratorSpec.scala b/project/src/test/scala/ScapegoatInspectionsGeneratorSpec.scala index fe130893..9dcc62b8 100644 --- a/project/src/test/scala/ScapegoatInspectionsGeneratorSpec.scala +++ b/project/src/test/scala/ScapegoatInspectionsGeneratorSpec.scala @@ -19,12 +19,14 @@ package com.mwz.sonar.scala.metadata.scapegoat import com.sksamuel.scapegoat.inspections.{AnyUse, EmptyCaseClass} import com.sksamuel.scapegoat.inspections.string.ArraysInFormat -import org.scalatest.{FlatSpec, LoneElement, Matchers} +import org.scalatest.LoneElement +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers import scala.meta._ /** Tests the correct behavior of the Scapegoat Inspections Generator SBT Task */ -class ScapegoatInspectionsGeneratorSpec extends FlatSpec with LoneElement with Matchers { +class ScapegoatInspectionsGeneratorSpec extends AnyFlatSpec with LoneElement with Matchers { "stringifyInspections" should "correctly format one scapegoat inspection" in { val expected = """ScapegoatInspection( From 7f2bf2e7157a61f4d4e9b5f0cc5d68090a4b44e2 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Wed, 16 Sep 2020 21:39:57 +0100 Subject: [PATCH 016/142] Scalafmt. --- .../sonar/scala/junit/JUnitReportParser.scala | 37 +++--- .../mwz/sonar/scala/junit/JUnitSensor.scala | 23 ++-- .../metadata/scalastyle/ScalastyleRules.scala | 99 ++++++++-------- .../sonar/scala/pr/GithubPrReviewJob.scala | 80 ++++++------- .../scalastyle/ScalastyleQualityProfile.scala | 4 +- .../scala/scalastyle/ScalastyleSensor.scala | 11 +- .../scapegoat/ScapegoatReportParser.scala | 13 +- .../scala/scoverage/ScoverageMeasures.scala | 20 ++-- .../scoverage/ScoverageReportParser.scala | 8 +- .../scala/scoverage/ScoverageSensor.scala | 4 +- .../com/mwz/sonar/scala/sensor/Measures.scala | 2 +- .../sonar/scala/SensorContextMatchers.scala | 8 +- .../scala/pr/GithubPrReviewJobSpec.scala | 112 +++++++++--------- .../mwz/sonar/scala/pr/GlobalIssuesSpec.scala | 5 +- .../com/mwz/sonar/scala/pr/PatchSpec.scala | 15 +-- .../sonar/scala/pr/github/GithubSpec.scala | 10 +- .../scapegoat/ScoverageMeasuresSpec.scala | 28 ++--- 17 files changed, 227 insertions(+), 252 deletions(-) diff --git a/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala b/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala index 22778ab0..4bc68bc5 100644 --- a/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala +++ b/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala @@ -101,24 +101,23 @@ final class JUnitReportParser(fileSystem: FileSystem) extends JUnitReportParserA ): Map[InputFile, JUnitReport] = reports .groupBy(_.name) - .flatMap { - case (name, reports) => - val path: String = name.replace(".", "/") - val files: List[Path] = tests.map(_.resolve(s"$path.scala")) - val predicates: List[FilePredicate] = - files.map(f => fileSystem.predicates.hasPath(f.toString)) - - val inputFiles: Iterable[InputFile] = - fileSystem - .inputFiles( - fileSystem.predicates.or(predicates.asJava) - ) - .asScala - - if (files.isEmpty) - log.error(s"The following files were not found: ${files.mkString(", ")}") - - // Collect all of the input files. - inputFiles.flatMap(file => reports.headOption.map((file, _))) + .flatMap { case (name, reports) => + val path: String = name.replace(".", "/") + val files: List[Path] = tests.map(_.resolve(s"$path.scala")) + val predicates: List[FilePredicate] = + files.map(f => fileSystem.predicates.hasPath(f.toString)) + + val inputFiles: Iterable[InputFile] = + fileSystem + .inputFiles( + fileSystem.predicates.or(predicates.asJava) + ) + .asScala + + if (files.isEmpty) + log.error(s"The following files were not found: ${files.mkString(", ")}") + + // Collect all of the input files. + inputFiles.flatMap(file => reports.headOption.map((file, _))) } } diff --git a/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala b/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala index 8934d617..30601147 100644 --- a/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala @@ -109,18 +109,17 @@ final class JUnitSensor( else log.info("No test metrics were saved by this sensor.") - reports.foreach { - case (file, report) => - log.info(s"Saving junit test metrics for $file.") - context.saveMeasure[Integer](file, CoreMetrics.SKIPPED_TESTS, report.skipped) - context.saveMeasure[Integer](file, CoreMetrics.TESTS, report.tests - report.skipped) - context.saveMeasure[Integer](file, CoreMetrics.TEST_ERRORS, report.errors) - context.saveMeasure[Integer](file, CoreMetrics.TEST_FAILURES, report.failures) - context.saveMeasure[java.lang.Long]( - file, - CoreMetrics.TEST_EXECUTION_TIME, - (report.time * 1000).longValue - ) + reports.foreach { case (file, report) => + log.info(s"Saving junit test metrics for $file.") + context.saveMeasure[Integer](file, CoreMetrics.SKIPPED_TESTS, report.skipped) + context.saveMeasure[Integer](file, CoreMetrics.TESTS, report.tests - report.skipped) + context.saveMeasure[Integer](file, CoreMetrics.TEST_ERRORS, report.errors) + context.saveMeasure[Integer](file, CoreMetrics.TEST_FAILURES, report.failures) + context.saveMeasure[java.lang.Long]( + file, + CoreMetrics.TEST_EXECUTION_TIME, + (report.time * 1000).longValue + ) } } } diff --git a/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala b/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala index 2bab0586..85eba480 100644 --- a/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala +++ b/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala @@ -64,66 +64,65 @@ object ScalastyleRules { private final case class Acc(codeBlock: Boolean, isEmpty: Boolean, text: String, prev: String) private[metadata] def format(s: String): String = { s.linesIterator - .foldLeft(Acc(codeBlock = false, isEmpty = true, "", "")) { - case (acc, l) => - // Remove all backslashes as they are unnecessary. - val line = l.replace("\\", "") - val trimmed = line.trim - val trippleQuote = trimmed.contains("```") - // Replace all code blocks (inline and multiline) with ``. - val withInlineCode = line.replaceAll("^```(scala)?$", "`").replace("`", "``") - val trimmedWithInlineCode = withInlineCode.trim + .foldLeft(Acc(codeBlock = false, isEmpty = true, "", "")) { case (acc, l) => + // Remove all backslashes as they are unnecessary. + val line = l.replace("\\", "") + val trimmed = line.trim + val trippleQuote = trimmed.contains("```") + // Replace all code blocks (inline and multiline) with ``. + val withInlineCode = line.replaceAll("^```(scala)?$", "`").replace("`", "``") + val trimmedWithInlineCode = withInlineCode.trim - acc match { - // Empty line. - case _ if trimmedWithInlineCode.length === 0 => - acc.copy(isEmpty = true) + acc match { + // Empty line. + case _ if trimmedWithInlineCode.length === 0 => + acc.copy(isEmpty = true) - // Previous line is code block. - case Acc(true, isEmpty, text, prev) => - if (!trippleQuote) { - val closed = prev.contains("``") && isEmpty - val space = if (closed) s" " else s"\n" - Acc( - codeBlock = prev.contains("``") && !isEmpty, - isEmpty = false, - s"$text$space$withInlineCode", - withInlineCode - ) - } else + // Previous line is code block. + case Acc(true, isEmpty, text, prev) => + if (!trippleQuote) { + val closed = prev.contains("``") && isEmpty + val space = if (closed) s" " else s"\n" + Acc( + codeBlock = prev.contains("``") && !isEmpty, + isEmpty = false, + s"$text$space$withInlineCode", + withInlineCode + ) + } else + Acc( + codeBlock = true, + isEmpty = false, + s"$text\n$trimmedWithInlineCode", + trimmedWithInlineCode + ) + + // Previous line not code block. + case Acc(false, isEmpty, text, _) => + if (!trippleQuote) + if (isEmpty) { + val space = if (text.isEmpty) "" else "\n" Acc( - codeBlock = true, + codeBlock = false, isEmpty = false, - s"$text\n$trimmedWithInlineCode", + s"$text$space$trimmedWithInlineCode", trimmedWithInlineCode ) - - // Previous line not code block. - case Acc(false, isEmpty, text, _) => - if (!trippleQuote) - if (isEmpty) { - val space = if (text.isEmpty) "" else "\n" - Acc( - codeBlock = false, - isEmpty = false, - s"$text$space$trimmedWithInlineCode", - trimmedWithInlineCode - ) - } else - Acc( - codeBlock = false, - isEmpty = false, - s"$text\n$trimmedWithInlineCode", - trimmedWithInlineCode - ) - else + } else Acc( - codeBlock = true, + codeBlock = false, isEmpty = false, s"$text\n$trimmedWithInlineCode", trimmedWithInlineCode ) - } + else + Acc( + codeBlock = true, + isEmpty = false, + s"$text\n$trimmedWithInlineCode", + trimmedWithInlineCode + ) + } } .text } @@ -149,7 +148,7 @@ object ScalastyleRules { // The TEXT parameter type is used for header parameter of the HeaderMatchesChecker inspection. case StringType if ruleClass === "org.scalastyle.file.HeaderMatchesChecker" && - name === "header" => + name === "header" => ParamType.Text case StringType => ParamType.String case IntegerType => ParamType.Integer diff --git a/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala b/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala index 5e25dae8..c149ee8a 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala @@ -170,9 +170,8 @@ final class GithubPrReviewJob( mappedPatches .collect { case (file, Left(error)) => (file, error) } .toList - .traverse { - case (file, error) => - Logger[F].error(s"Error parsing patch for $file.") >> + .traverse { case (file, error) => + Logger[F].error(s"Error parsing patch for $file.") >> Logger[F].debug(s"""Invalid patch format: "${error.text}".""") } issuesWithComments = allCommentsForIssues(issues, mappedPatches, sonarComments) @@ -192,38 +191,36 @@ object GithubPrReviewJob { allUserComments: Map[String, List[Comment]] ): Map[InputFile, Map[PatchLine, List[(Issue, List[Comment])]]] = { issues - .collect { - case (file, issues) => - val issuesWithComments: Map[PatchLine, List[(Issue, List[Comment])]] = - issues - .flatMap { issue => - // patchLine -> issue - mappedPatchLines - .get(file.toString) - .flatMap(_.toOption.flatMap { - mapping => - mapping - .get(FileLine(issue.line)) - .map { patchLine => - // patchLine -> comments - // Filter comments by the line number. - // Those are filtered again later on based on the body text. - val comments: List[Comment] = - allUserComments - .get(file.toString) - // Outdated comments are filtered out here - // as they don't have a current position. - .map(_.filter(_.position.contains(patchLine.value))) - .getOrElse(List.empty) - (patchLine, List((issue, comments))) - } - }) - } - .groupBy { case (patchLine, _) => patchLine } - .view - .mapValues(_.flatMap { case (_, issuesAndComments) => issuesAndComments }) - .toMap - (file, issuesWithComments) + .collect { case (file, issues) => + val issuesWithComments: Map[PatchLine, List[(Issue, List[Comment])]] = + issues + .flatMap { issue => + // patchLine -> issue + mappedPatchLines + .get(file.toString) + .flatMap(_.toOption.flatMap { mapping => + mapping + .get(FileLine(issue.line)) + .map { patchLine => + // patchLine -> comments + // Filter comments by the line number. + // Those are filtered again later on based on the body text. + val comments: List[Comment] = + allUserComments + .get(file.toString) + // Outdated comments are filtered out here + // as they don't have a current position. + .map(_.filter(_.position.contains(patchLine.value))) + .getOrElse(List.empty) + (patchLine, List((issue, comments))) + } + }) + } + .groupBy { case (patchLine, _) => patchLine } + .view + .mapValues(_.flatMap { case (_, issuesAndComments) => issuesAndComments }) + .toMap + (file, issuesWithComments) } } @@ -250,13 +247,12 @@ object GithubPrReviewJob { .groupBy(i => i.severity) .view .mapValues(_.size) - .foldLeft(ReviewStatus(0, 0)) { - case (s, (severity, count)) => - severity match { - case Severity.BLOCKER => s.copy(blocker = s.blocker + count) - case Severity.CRITICAL => s.copy(critical = s.critical + count) - case _ => s - } + .foldLeft(ReviewStatus(0, 0)) { case (s, (severity, count)) => + severity match { + case Severity.BLOCKER => s.copy(blocker = s.blocker + count) + case Severity.CRITICAL => s.copy(critical = s.critical + count) + case _ => s + } } } diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala index e61d1e78..0a7479e0 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala @@ -85,8 +85,8 @@ object ScalastyleQualityProfile { overrides.params .get(rule.key) .foreach { - _.foreach { - case (k, v) => activeRule.overrideParam(k, v) + _.foreach { case (k, v) => + activeRule.overrideParam(k, v) } } } diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala index 2f39d30c..f9f13f96 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala @@ -87,12 +87,11 @@ final class ScalastyleSensor( .toMap // Log a warning for invalid rules. - checks.filter { case (_, conf) => conf.isEmpty } foreach { - case (ruleKey, _) => - log.warn( - s"Rule $ruleKey is missing the ${ScalastyleRulesRepository.RuleClassParam} parameter " + - "and it will be skipped during the analysis." - ) + checks.filter { case (_, conf) => conf.isEmpty } foreach { case (ruleKey, _) => + log.warn( + s"Rule $ruleKey is missing the ${ScalastyleRulesRepository.RuleClassParam} parameter " + + "and it will be skipped during the analysis." + ) } val config: ScalastyleConfiguration = new ScalastyleConfiguration( diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala index 164dcec1..759e07a5 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala @@ -39,13 +39,12 @@ final class ScapegoatReportParser extends ScapegoatReportParserAPI { */ private[scapegoat] def replaceAllDotsButLastWithSlashes(path: String): String = if (path.startsWith(".")) { - path.split('.').foldLeft[String]("") { - case (acc, str) => - val s = Option(str).filter(_.nonEmpty).getOrElse("/") - val a = Option(acc).filter(_.nonEmpty).getOrElse("/") - if (Paths.get(a).toFile.exists) - Paths.get(a).resolve(s).toString - else s"$a.$str" + path.split('.').foldLeft[String]("") { case (acc, str) => + val s = Option(str).filter(_.nonEmpty).getOrElse("/") + val a = Option(acc).filter(_.nonEmpty).getOrElse("/") + if (Paths.get(a).toFile.exists) + Paths.get(a).resolve(s).toString + else s"$a.$str" } } else allDotsButLastRegex.replaceAllIn(target = path, replacement = "/") diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala index c5c734d2..109fff80 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala @@ -66,17 +66,15 @@ final class ScoverageMeasures extends MeasureComputer { val percentages: Map[String, BigDecimal] = percentageMetrics - .map { - case (key, (total, hits)) => - ( - key, - (summed.get(total), summed.get(hits)).bisequence - .map { - case (total, hits) => - if (total > 0) BigDecimal.valueOf(hits.toLong) / total * 100 - else BigDecimal(0) - } - ) + .map { case (key, (total, hits)) => + ( + key, + (summed.get(total), summed.get(hits)).bisequence + .map { case (total, hits) => + if (total > 0) BigDecimal.valueOf(hits.toLong) / total * 100 + else BigDecimal(0) + } + ) } .collect { case (key, Some(sum)) => (key, sum) } .iterator diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala index e6d590e4..efec2649 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala @@ -101,8 +101,8 @@ final class ScoverageReportParser extends ScoverageReportParserAPI { linesCoverage = lines - .groupMapReduce { case (lineNum, _) => lineNum } { - case (_, count) => count + .groupMapReduce { case (lineNum, _) => lineNum } { case (_, count) => + count }(_ + _) classCoverage = FileCoverage(classScoverage, linesCoverage) @@ -111,8 +111,8 @@ final class ScoverageReportParser extends ScoverageReportParserAPI { // Merge the class coverages by filename. val files = classCoverages - .groupMapReduce { case (fileName, _) => fileName } { - case (_, classCoverage) => classCoverage + .groupMapReduce { case (fileName, _) => fileName } { case (_, classCoverage) => + classCoverage }(_ |+| _) ProjectCoverage(projectScoverage, files) diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala index 1213429f..d16f7232 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala @@ -85,8 +85,8 @@ final class ScoverageSensor( // save the coverage of each line of the file val coverage = context.newCoverage() coverage.onFile(file) - fileCoverage.linesCoverage foreach { - case (lineNum, hits) => coverage.lineHits(lineNum, hits) + fileCoverage.linesCoverage foreach { case (lineNum, hits) => + coverage.lineHits(lineNum, hits) } // Save the coverage (if not in pr decoration mode). diff --git a/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala b/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala index b6c7bf57..244cec75 100644 --- a/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala +++ b/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala @@ -75,7 +75,7 @@ object Measures { Nil case token :: tail if token.tokenType === Tokens.WS && - NewLineRegex.findFirstIn(token.text).nonEmpty => + NewLineRegex.findFirstIn(token.text).nonEmpty => tail case token :: tail if token.tokenType === Tokens.LINE_COMMENT => tail diff --git a/src/test/scala/com/mwz/sonar/scala/SensorContextMatchers.scala b/src/test/scala/com/mwz/sonar/scala/SensorContextMatchers.scala index 0c1d1800..f5ea6d52 100644 --- a/src/test/scala/com/mwz/sonar/scala/SensorContextMatchers.scala +++ b/src/test/scala/com/mwz/sonar/scala/SensorContextMatchers.scala @@ -65,8 +65,8 @@ trait SensorContextMatchers extends Matchers { b match { case b: IssueLocation => a.inputComponent === b.inputComponent && - a.message === b.message && - a.textRange === b.textRange + a.message === b.message && + a.textRange === b.textRange case _ => false } } @@ -78,8 +78,8 @@ trait SensorContextMatchers extends Matchers { b match { case b: Issue => a.ruleKey === b.ruleKey && - a.primaryLocation === b.primaryLocation && - a.overriddenSeverity === b.overriddenSeverity + a.primaryLocation === b.primaryLocation && + a.overriddenSeverity === b.overriddenSeverity case _ => false } } diff --git a/src/test/scala/com/mwz/sonar/scala/pr/GithubPrReviewJobSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/GithubPrReviewJobSpec.scala index eeea2ef8..602f7acf 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/GithubPrReviewJobSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/GithubPrReviewJobSpec.scala @@ -206,26 +206,25 @@ class GithubPrReviewJobSpec it should "log and skip patches which can't be parsed" in new Ctx with IOCtx { forAll { (baseUrl: Uri, user: User, pr: PullRequest, prFiles: NonEmptyList[File]) => withTracing { trace => - withLogging { - case (logs, implicit0(logger: Logger[IO])) => - val github = new GithubNotImpl[IO] { - override def comments = trace.update("comments" :: _) >> IO.pure(List.empty) - override def files = trace.update("files" :: _) >> IO.pure(prFiles.toList) - } - val file: InputFile = TestInputFileBuilder.create("", prFiles.head.filename).build() - val issue = Issue(RuleKey.of("repo", "rule"), file, 1, Severity.CRITICAL, "msg") - - val issues = new GlobalIssues - issues.add(issue) - val result = githubPrReviewJob(globalIssues = issues).review[IO](baseUrl, github, user, pr) - - result.attempt.unsafeRunSync() shouldBe Right(ReviewStatus(blocker = 0, critical = 1)) - trace.get.unsafeRunSync() should contain theSameElementsAs List("files", "comments") - logs.get.unsafeRunSync().collect { - case (level, msg) if level === LogLevel.Error => msg - } should contain theSameElementsAs List( - s"Error parsing patch for ${prFiles.head.filename}." - ) + withLogging { case (logs, implicit0(logger: Logger[IO])) => + val github = new GithubNotImpl[IO] { + override def comments = trace.update("comments" :: _) >> IO.pure(List.empty) + override def files = trace.update("files" :: _) >> IO.pure(prFiles.toList) + } + val file: InputFile = TestInputFileBuilder.create("", prFiles.head.filename).build() + val issue = Issue(RuleKey.of("repo", "rule"), file, 1, Severity.CRITICAL, "msg") + + val issues = new GlobalIssues + issues.add(issue) + val result = githubPrReviewJob(globalIssues = issues).review[IO](baseUrl, github, user, pr) + + result.attempt.unsafeRunSync() shouldBe Right(ReviewStatus(blocker = 0, critical = 1)) + trace.get.unsafeRunSync() should contain theSameElementsAs List("files", "comments") + logs.get.unsafeRunSync().collect { + case (level, msg) if level === LogLevel.Error => msg + } should contain theSameElementsAs List( + s"Error parsing patch for ${prFiles.head.filename}." + ) } } } @@ -234,39 +233,38 @@ class GithubPrReviewJobSpec it should "post comments for pr issues" in new Ctx with IOCtx with EmptyLogger { forAll { (baseUrl: Uri, user: User, pr: PullRequest, prFile: File) => withTracing { trace => - withLogging { - case (logs, implicit0(logger: Logger[IO])) => - val fileWithPatch = prFile.copy(patch = patch) - val github = new GithubNotImpl[IO] { - override def comments = trace.update("comments" :: _) >> IO.pure(List.empty) - override def createComment(comment: NewComment) = - trace.update("createComment" :: _) >> - IO.pure(Comment(1, comment.path, Some(comment.position), user, comment.body)) - override def files = trace.update("files" :: _) >> IO.pure(List(fileWithPatch)) - } - val file: InputFile = TestInputFileBuilder.create("", fileWithPatch.filename).build() - val issue = Issue(RuleKey.of("repo", "rule"), file, 5, Severity.BLOCKER, "msg") - val markdown: Markdown = Markdown.inline(baseUrl, issue) - - val issues = new GlobalIssues - issues.add(issue) - val result = githubPrReviewJob(globalIssues = issues).review[IO](baseUrl, github, user, pr) - - result.attempt.unsafeRunSync() shouldBe Right(ReviewStatus(blocker = 1, critical = 0)) - trace.get.unsafeRunSync() should contain theSameElementsAs List( - "files", - "comments", - "createComment" - ) - logs.get.unsafeRunSync().collect { - case (level, msg) - if level === LogLevel.Info || + withLogging { case (logs, implicit0(logger: Logger[IO])) => + val fileWithPatch = prFile.copy(patch = patch) + val github = new GithubNotImpl[IO] { + override def comments = trace.update("comments" :: _) >> IO.pure(List.empty) + override def createComment(comment: NewComment) = + trace.update("createComment" :: _) >> + IO.pure(Comment(1, comment.path, Some(comment.position), user, comment.body)) + override def files = trace.update("files" :: _) >> IO.pure(List(fileWithPatch)) + } + val file: InputFile = TestInputFileBuilder.create("", fileWithPatch.filename).build() + val issue = Issue(RuleKey.of("repo", "rule"), file, 5, Severity.BLOCKER, "msg") + val markdown: Markdown = Markdown.inline(baseUrl, issue) + + val issues = new GlobalIssues + issues.add(issue) + val result = githubPrReviewJob(globalIssues = issues).review[IO](baseUrl, github, user, pr) + + result.attempt.unsafeRunSync() shouldBe Right(ReviewStatus(blocker = 1, critical = 0)) + trace.get.unsafeRunSync() should contain theSameElementsAs List( + "files", + "comments", + "createComment" + ) + logs.get.unsafeRunSync().collect { + case (level, msg) + if level === LogLevel.Info || (level === LogLevel.Debug && msg.contains("Posting a new comment for")) => - msg - } should contain theSameElementsAs List( - "Posting new comments to Github.", - s"Posting a new comment for ${prFile.filename}:${issue.line} - ${markdown.text}" - ) + msg + } should contain theSameElementsAs List( + "Posting new comments to Github.", + s"Posting a new comment for ${prFile.filename}:${issue.line} - ${markdown.text}" + ) } } } @@ -428,9 +426,8 @@ class GithubPrReviewJobSpec .view .mapValues(_.groupBy(v => PatchLine(v._1.line))) .toMap - val newComments = issuesComments.map { - case (issue, _) => - NewComment(Markdown.inline(uri, issue).text, commit, issue.file.toString, issue.line) + val newComments = issuesComments.map { case (issue, _) => + NewComment(Markdown.inline(uri, issue).text, commit, issue.file.toString, issue.line) } GithubPrReviewJob.commentsForNewIssues(uri, commit, issues) should @@ -455,9 +452,8 @@ class GithubPrReviewJobSpec .mapValues(_.groupBy(v => PatchLine(v._1.line))) .toMap - val newComments = issues.map { - case (issue, _) => - NewComment(Markdown.inline(uri, issue).text, commit, issue.file.toString, issue.line) + val newComments = issues.map { case (issue, _) => + NewComment(Markdown.inline(uri, issue).text, commit, issue.file.toString, issue.line) } GithubPrReviewJob.commentsForNewIssues( diff --git a/src/test/scala/com/mwz/sonar/scala/pr/GlobalIssuesSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/GlobalIssuesSpec.scala index 99d0d262..9ea44892 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/GlobalIssuesSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/GlobalIssuesSpec.scala @@ -53,9 +53,8 @@ class GlobalIssuesSpec extends AnyFlatSpec with Matchers with ScalaCheckDrivenPr issues.foreach(globalIssues.add) - Inspectors.forAll(globalIssues.allIssues) { - case (file, issues) => - issues should contain theSameElementsAs expected(file) + Inspectors.forAll(globalIssues.allIssues) { case (file, issues) => + issues should contain theSameElementsAs expected(file) } } } diff --git a/src/test/scala/com/mwz/sonar/scala/pr/PatchSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/PatchSpec.scala index 4d04ab0f..754aa544 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/PatchSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/PatchSpec.scala @@ -38,9 +38,8 @@ class PatchSpec extends AnyFlatSpec with Matchers with EitherValues with ScalaCh it should "parse successfully a patch with additions only" in { val expected: Map[FileLine, PatchLine] = - (69 to 84).zipWithIndex.map { - case (fileLine, index) => - (FileLine(fileLine), PatchLine(index + 1)) + (69 to 84).zipWithIndex.map { case (fileLine, index) => + (FileLine(fileLine), PatchLine(index + 1)) }.toMap Patch.parse(patch("patches/add.patch")).right.value shouldBe expected @@ -51,9 +50,8 @@ class PatchSpec extends AnyFlatSpec with Matchers with EitherValues with ScalaCh List( List(26 -> 1, 27 -> 2, 28 -> 3, 29 -> 6, 30 -> 7, 31 -> 8), List(43 -> 10, 44 -> 11, 45 -> 12, 46 -> 15, 47 -> 16, 48 -> 20, 49 -> 21, 50 -> 22) - ).flatten.map { - case (k, v) => - FileLine(k) -> PatchLine(v) + ).flatten.map { case (k, v) => + FileLine(k) -> PatchLine(v) }.toMap Patch.parse(patch("patches/del.patch")).right.value shouldBe expected @@ -65,9 +63,8 @@ class PatchSpec extends AnyFlatSpec with Matchers with EitherValues with ScalaCh (43 to 50).zipWithIndex.map(a => (a._1, a._2 + 1)), List(60 -> 10, 61 -> 11, 62 -> 12, 63 -> 15, 64 -> 16, 65 -> 17), List(77 -> 19, 78 -> 20, 79 -> 21, 80 -> 23, 81 -> 24, 82 -> 25, 83 -> 26) - ).flatten.map { - case (k, v) => - FileLine(k) -> PatchLine(v) + ).flatten.map { case (k, v) => + FileLine(k) -> PatchLine(v) }.toMap Patch.parse(patch("patches/add-del-mod.patch")).right.value shouldBe expected diff --git a/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala index c3db36fd..cec7cc3d 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala @@ -66,9 +66,8 @@ class GithubSpec extends AnyFlatSpec with Matchers with ScalaCheckDrivenProperty AuthMiddleware(authUser) it should "get the authenticated user" in { - val service = AuthedRoutes.of[String, IO] { - case GET -> Root / "user" as _ => - Ok(user) + val service = AuthedRoutes.of[String, IO] { case GET -> Root / "user" as _ => + Ok(user) } val client = Client.fromHttpApp(HttpApp(auth(service).orNotFound.run)) @@ -77,9 +76,8 @@ class GithubSpec extends AnyFlatSpec with Matchers with ScalaCheckDrivenProperty it should "get a pull request" in { forAll { (pr: PullRequest) => - val http = HttpRoutes.of[IO] { - case _ @GET -> Root / "repos" / "owner" / "repo" / "pulls" / _ => - Ok(pr) + val http = HttpRoutes.of[IO] { case _ @GET -> Root / "repos" / "owner" / "repo" / "pulls" / _ => + Ok(pr) } val client = Client.fromHttpApp(http.orNotFound) diff --git a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScoverageMeasuresSpec.scala b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScoverageMeasuresSpec.scala index 0660bc5e..6b45f782 100644 --- a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScoverageMeasuresSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScoverageMeasuresSpec.scala @@ -69,23 +69,20 @@ class ScoverageMeasuresSpec extends AnyFlatSpec with Matchers with ScalaCheckDri ) val expectedPercentageMeasures: List[(String, Double)] = - percentageMetrics zip expectedSumMeasures.grouped(2).map { - case List((_, total), (_, actual)) => - if (total > 0) - (BigDecimal.valueOf(actual.doubleValue) / total.intValue * 100) - .setScale(scale = 2, mode = BigDecimal.RoundingMode.HALF_EVEN) - .toDouble - else 0 + percentageMetrics zip expectedSumMeasures.grouped(2).map { case List((_, total), (_, actual)) => + if (total > 0) + (BigDecimal.valueOf(actual.doubleValue) / total.intValue * 100) + .setScale(scale = 2, mode = BigDecimal.RoundingMode.HALF_EVEN) + .toDouble + else 0 } - Inspectors.forAll(expectedSumMeasures) { - case (key, value) => - ctx.getMeasure(key).getIntValue shouldBe value + Inspectors.forAll(expectedSumMeasures) { case (key, value) => + ctx.getMeasure(key).getIntValue shouldBe value } - Inspectors.forAll(expectedPercentageMeasures) { - case (key, value) => - ctx.getMeasure(key).getDoubleValue shouldBe value + Inspectors.forAll(expectedPercentageMeasures) { case (key, value) => + ctx.getMeasure(key).getDoubleValue shouldBe value } } } @@ -111,9 +108,8 @@ class ScoverageMeasuresSpec extends AnyFlatSpec with Matchers with ScalaCheckDri } def addMeasures(ctx: TestMeasureComputerContext, values: List[(String, List[Integer])]): Unit = - values.foreach { - case (key, summed) => - ctx.addChildrenMeasures(key, summed: _*) + values.foreach { case (key, summed) => + ctx.addChildrenMeasures(key, summed: _*) } def sum(values: List[Integer]): Integer = From 287ed9b37aaa898179e0de6367da47e0665e45f3 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Wed, 16 Sep 2020 21:47:33 +0100 Subject: [PATCH 017/142] Update examples. --- .../multi-module/module1/src/test/scala/Example1Test.scala | 5 +++-- .../multi-module/module2/src/test/scala/Example2Test.scala | 5 +++-- examples/sbt/multi-module/src/test/scala/ExampleTest.scala | 5 +++-- examples/sbt/single-module/src/test/scala/ExampleTest.scala | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/examples/sbt/multi-module/module1/src/test/scala/Example1Test.scala b/examples/sbt/multi-module/module1/src/test/scala/Example1Test.scala index 8fff92cc..e0c1e74f 100644 --- a/examples/sbt/multi-module/module1/src/test/scala/Example1Test.scala +++ b/examples/sbt/multi-module/module1/src/test/scala/Example1Test.scala @@ -1,6 +1,7 @@ -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class Example1Test extends FlatSpec with Matchers { +class Example1Test extends AnyFlatSpec with Matchers { "Example1" should "sum two numbers" in { Example1.sum(1, 5) shouldBe 6 } diff --git a/examples/sbt/multi-module/module2/src/test/scala/Example2Test.scala b/examples/sbt/multi-module/module2/src/test/scala/Example2Test.scala index 7758e39b..9904c417 100644 --- a/examples/sbt/multi-module/module2/src/test/scala/Example2Test.scala +++ b/examples/sbt/multi-module/module2/src/test/scala/Example2Test.scala @@ -1,6 +1,7 @@ -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class Example2Test extends FlatSpec with Matchers { +class Example2Test extends AnyFlatSpec with Matchers { "Example2" should "sum two numbers" in { // No coverage! } diff --git a/examples/sbt/multi-module/src/test/scala/ExampleTest.scala b/examples/sbt/multi-module/src/test/scala/ExampleTest.scala index 6a2cce4d..d0f03b01 100644 --- a/examples/sbt/multi-module/src/test/scala/ExampleTest.scala +++ b/examples/sbt/multi-module/src/test/scala/ExampleTest.scala @@ -1,6 +1,7 @@ -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class ExampleTest extends FlatSpec with Matchers { +class ExampleTest extends AnyFlatSpec with Matchers { "Example" should "sum two numbers" in { Example.sum(1, 5) shouldBe 6 } diff --git a/examples/sbt/single-module/src/test/scala/ExampleTest.scala b/examples/sbt/single-module/src/test/scala/ExampleTest.scala index 6a2cce4d..d0f03b01 100644 --- a/examples/sbt/single-module/src/test/scala/ExampleTest.scala +++ b/examples/sbt/single-module/src/test/scala/ExampleTest.scala @@ -1,6 +1,7 @@ -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class ExampleTest extends FlatSpec with Matchers { +class ExampleTest extends AnyFlatSpec with Matchers { "Example" should "sum two numbers" in { Example.sum(1, 5) shouldBe 6 } From ec6df043975611c48c226cabb2d8ef9a7c43ca71 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 22:59:04 +0200 Subject: [PATCH 018/142] Update mockito-scala to 1.15.0 (#517) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 5c16a1be..911c737f 100644 --- a/build.sbt +++ b/build.sbt @@ -80,7 +80,7 @@ libraryDependencies ++= List( "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5" % Test, "org.http4s" %% "http4s-blaze-server" % http4s % Test, "org.http4s" %% "http4s-dsl" % http4s % Test, - "org.mockito" %% "mockito-scala" % "1.14.8" % Test, + "org.mockito" %% "mockito-scala" % "1.15.0" % Test, "org.scalacheck" %% "scalacheck" % "1.14.3" % Test, "org.scalatest" %% "scalatest" % "3.2.0" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, From 13967527b7e0e11eae753b8eb85dea27cea27c39 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 22:59:22 +0200 Subject: [PATCH 019/142] Update scalatest to 3.2.2 (#518) [ci skip] --- build.sbt | 2 +- examples/sbt/multi-module/build.sbt | 2 +- examples/sbt/single-module/build.sbt | 2 +- project/build.sbt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 911c737f..f365b347 100644 --- a/build.sbt +++ b/build.sbt @@ -82,7 +82,7 @@ libraryDependencies ++= List( "org.http4s" %% "http4s-dsl" % http4s % Test, "org.mockito" %% "mockito-scala" % "1.15.0" % Test, "org.scalacheck" %% "scalacheck" % "1.14.3" % Test, - "org.scalatest" %% "scalatest" % "3.2.0" % Test, + "org.scalatest" %% "scalatest" % "3.2.2" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test, "com.softwaremill.diffx" %% "diffx-scalatest" % "0.3.29" % Test, diff --git a/examples/sbt/multi-module/build.sbt b/examples/sbt/multi-module/build.sbt index 40b6f2f8..25a17e91 100644 --- a/examples/sbt/multi-module/build.sbt +++ b/examples/sbt/multi-module/build.sbt @@ -1,6 +1,6 @@ lazy val baseSettings = Seq( scalaVersion := "2.12.8", - libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.0" % "test", + libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.2" % "test", scapegoatVersion in ThisBuild := "1.3.9" ) diff --git a/examples/sbt/single-module/build.sbt b/examples/sbt/single-module/build.sbt index 01f63913..5ee4b192 100644 --- a/examples/sbt/single-module/build.sbt +++ b/examples/sbt/single-module/build.sbt @@ -1,4 +1,4 @@ name := "sbt-single-module" scalaVersion := "2.12.8" -libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.0" % "test" +libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.2" % "test" scapegoatVersion in ThisBuild := "1.3.9" diff --git a/project/build.sbt b/project/build.sbt index 0c82374d..70e189b8 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -5,7 +5,7 @@ libraryDependencies ++= Seq( "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.4", "com.beautiful-scala" %% "scalastyle" % "1.4.0", "org.scalameta" %% "scalameta" % "4.3.22", - "org.scalatest" %% "scalatest" % "3.2.0" % Test + "org.scalatest" %% "scalatest" % "3.2.2" % Test ) // Adding a resolver to the Artima maven repo, so sbt can download the Artima SuperSafe sbt plugin From 859e73680277f93df6577e60893c1c3c882e6263 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Sep 2020 23:05:45 +0200 Subject: [PATCH 020/142] Update cats-effect to 2.2.0 (#519) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f365b347..aa2917e1 100644 --- a/build.sbt +++ b/build.sbt @@ -73,7 +73,7 @@ libraryDependencies ++= List( "org.slf4j" % "slf4j-api" % "1.7.30" % Provided, "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, "org.typelevel" %% "cats-core" % "2.1.1", - "org.typelevel" %% "cats-effect" % "2.1.4", + "org.typelevel" %% "cats-effect" % "2.2.0", "org.typelevel" %% "mouse" % "0.25", // TEST "com.beachape" %% "enumeratum-scalacheck" % "1.6.1" % Test, From 8276580a96125cb7ae62de7e949b2ae050773de0 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Wed, 16 Sep 2020 22:31:18 +0100 Subject: [PATCH 021/142] Update cats to 2.2 (#520) Co-authored-by: Scala Steward --- build.sbt | 2 +- src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala | 1 - src/main/scala/com/mwz/sonar/scala/Metadata.scala | 1 - src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala | 1 - .../mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala | 2 -- src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala | 2 -- src/main/scala/com/mwz/sonar/scala/pr/patch.scala | 2 -- .../com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala | 1 - .../scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala | 1 - .../com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala | 3 --- .../scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala | 1 - src/main/scala/com/mwz/sonar/scala/scoverage/package.scala | 2 -- src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala | 1 - .../scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala | 1 - .../com/mwz/sonar/scala/util/syntax/SonarFileSystemSpec.scala | 2 -- 15 files changed, 1 insertion(+), 22 deletions(-) diff --git a/build.sbt b/build.sbt index aa2917e1..e7ab723f 100644 --- a/build.sbt +++ b/build.sbt @@ -72,7 +72,7 @@ libraryDependencies ++= List( "org.scalariform" %% "scalariform" % "0.2.10", "org.slf4j" % "slf4j-api" % "1.7.30" % Provided, "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, - "org.typelevel" %% "cats-core" % "2.1.1", + "org.typelevel" %% "cats-core" % "2.2.0", "org.typelevel" %% "cats-effect" % "2.2.0", "org.typelevel" %% "mouse" % "0.25", // TEST diff --git a/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala b/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala index 8110b3b0..3d797ac3 100644 --- a/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala +++ b/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala @@ -19,7 +19,6 @@ package com.mwz.sonar.scala import cats.data.EitherT import cats.instances.option._ -import cats.instances.string._ import cats.syntax.alternative._ import cats.syntax.either._ import cats.syntax.eq._ diff --git a/src/main/scala/com/mwz/sonar/scala/Metadata.scala b/src/main/scala/com/mwz/sonar/scala/Metadata.scala index eb840af5..0352f5ed 100644 --- a/src/main/scala/com/mwz/sonar/scala/Metadata.scala +++ b/src/main/scala/com/mwz/sonar/scala/Metadata.scala @@ -25,7 +25,6 @@ import cats.effect.Blocker import cats.effect.ExitCode import cats.effect.IO import cats.effect.IOApp -import cats.instances.string._ import com.mwz.sonar.scala.metadata._ import com.mwz.sonar.scala.metadata.scalastyle.ScalastyleRules import com.mwz.sonar.scala.metadata.scalastyle.ScalastyleRulesRepository diff --git a/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala b/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala index 30601147..7a0a312f 100644 --- a/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala @@ -23,7 +23,6 @@ import java.nio.file.{Path, Paths} import scala.jdk.CollectionConverters._ -import cats.instances.list._ import com.mwz.sonar.scala.util.Log import com.mwz.sonar.scala.util.syntax.SonarConfig._ import com.mwz.sonar.scala.util.syntax.SonarFileSystem._ diff --git a/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala b/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala index 85eba480..84d33628 100644 --- a/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala +++ b/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala @@ -20,8 +20,6 @@ package scalastyle import cats.data.Chain import cats.data.NonEmptyChain -import cats.instances.int._ -import cats.instances.string._ import cats.syntax.eq._ import cats.syntax.option._ import org.scalastyle.Level diff --git a/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala b/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala index c149ee8a..6209a3e4 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala @@ -23,8 +23,6 @@ import scala.concurrent.ExecutionContext import cats.NonEmptyParallel import cats.data.NonEmptyList import cats.effect.{ContextShift, IO, Sync} -import cats.instances.list._ -import cats.instances.string._ import cats.syntax.either._ import cats.syntax.eq._ import cats.syntax.flatMap._ diff --git a/src/main/scala/com/mwz/sonar/scala/pr/patch.scala b/src/main/scala/com/mwz/sonar/scala/pr/patch.scala index 184daf6e..03a7056b 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/patch.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/patch.scala @@ -21,8 +21,6 @@ package pr import scala.util.Try import scala.util.matching.Regex -import cats.instances.either._ -import cats.instances.list._ import cats.syntax.foldable._ final case class PatchLine(value: Int) { diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala index f9f13f96..59d3a5a3 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala @@ -23,7 +23,6 @@ import java.nio.file.Paths import scala.jdk.CollectionConverters._ -import cats.instances.string._ import cats.syntax.eq._ import com.mwz.sonar.scala.metadata.Rule import com.mwz.sonar.scala.metadata.scalastyle.ScalastyleRules diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala index aa57215b..8ffd884b 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala @@ -22,7 +22,6 @@ import java.nio.file.{Path, Paths} import scala.util.{Failure, Success, Try} -import cats.instances.string._ import cats.syntax.eq._ import com.mwz.sonar.scala.metadata.scapegoat.ScapegoatRules import com.mwz.sonar.scala.metadata.scapegoat.ScapegoatRulesRepository diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala index 109fff80..ed05475a 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala @@ -23,9 +23,6 @@ import scala.jdk.CollectionConverters._ import ScoverageMeasures._ import cats.data.Chain import cats.data.Chain._ -import cats.instances.option._ -import cats.instances.string._ -import cats.instances.tuple._ import cats.syntax.bitraverse._ import cats.syntax.eq._ import cats.syntax.foldable._ diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala index d16f7232..0d0d80e7 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala @@ -23,7 +23,6 @@ import java.nio.file.{Path, Paths} import scala.jdk.CollectionConverters._ import scala.util.{Failure, Success, Try} -import cats.instances.string._ import cats.syntax.eq._ import com.mwz.sonar.scala.scoverage.ScoverageSensor._ import com.mwz.sonar.scala.util.PathUtils._ diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/package.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/package.scala index b67f39ee..6aea752e 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/package.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/package.scala @@ -19,8 +19,6 @@ package com.mwz.sonar.scala import scala.util.Try -import cats.instances.int.catsKernelStdGroupForInt -import cats.instances.map.catsKernelStdMonoidForMap import cats.kernel.Semigroup import cats.syntax.semigroup.catsSyntaxSemigroup diff --git a/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala b/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala index 244cec75..64d1d589 100644 --- a/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala +++ b/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala @@ -21,7 +21,6 @@ package sensor import scala.annotation.tailrec import scala.util.matching.Regex -import cats.instances.char._ import cats.kernel.Eq import cats.syntax.eq._ import scalariform.lexer.{Token, TokenType, Tokens} diff --git a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala index ab44a0a3..2ddf8032 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala @@ -21,7 +21,6 @@ package syntax import java.nio.file.{Path, Paths} -import cats.instances.string._ import cats.syntax.eq._ import com.mwz.sonar.scala.util.syntax.Optionals._ import org.sonar.api.config.Configuration diff --git a/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystemSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystemSpec.scala index 9f12a647..73a445c6 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystemSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystemSpec.scala @@ -21,8 +21,6 @@ package syntax import java.nio.file.{Path, Paths} -import cats.instances.list._ -import cats.instances.option._ import com.mwz.sonar.scala.util.syntax.SonarFileSystem._ import org.mockito.ArgumentMatchers._ import org.mockito.Mockito._ From 43a1c3d9e93d8d1038b56b2cdac97be94fd5ac56 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Wed, 16 Sep 2020 22:48:39 +0100 Subject: [PATCH 022/142] Update Scalastyle to 1.5.0. (#521) --- build.sbt | 2 +- project/build.sbt | 2 +- sonar-scala-metadata.json | 23 +++++++++++++++++++ .../RecommendedQualityProfileSpec.scala | 4 ++-- ...calastyleScapegoatQualityProfileSpec.scala | 2 +- .../ScalastyleQualityProfileSpec.scala | 4 ++-- .../ScalastyleRulesRepositorySpec.scala | 4 ++-- 7 files changed, 32 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index e7ab723f..139c0a04 100644 --- a/build.sbt +++ b/build.sbt @@ -62,7 +62,7 @@ libraryDependencies ++= List( "com.beachape" %% "enumeratum" % "1.6.1", "com.beachape" %% "enumeratum-cats" % "1.6.1", "com.beachape" %% "enumeratum-circe" % "1.6.1", - "com.beautiful-scala" %% "scalastyle" % "1.4.0", + "com.beautiful-scala" %% "scalastyle" % "1.5.0", "io.circe" %% "circe-core" % circe, "io.circe" %% "circe-generic-extras" % "0.13.0", "io.circe" %% "circe-generic" % circe, diff --git a/project/build.sbt b/project/build.sbt index 70e189b8..8a991678 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -3,7 +3,7 @@ libraryDependencies ++= Seq( "org.sonarsource.update-center" % "sonar-update-center-common" % "1.25.0.830", // Scapegoat & scalastyle inspections generator dependencies "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.4", - "com.beautiful-scala" %% "scalastyle" % "1.4.0", + "com.beautiful-scala" %% "scalastyle" % "1.5.0", "org.scalameta" %% "scalameta" % "4.3.22", "org.scalatest" %% "scalatest" % "3.2.2" % Test ) diff --git a/sonar-scala-metadata.json b/sonar-scala-metadata.json index 39a646db..dce477cd 100644 --- a/sonar-scala-metadata.json +++ b/sonar-scala-metadata.json @@ -1144,6 +1144,21 @@ "severity": "Minor", "template": false }, + { + "description": "*Checks that throw is not used.*\n\n`throw` statements should be replaced with type-safe error constructs like `Try` and `Either`, which communicate the possibility of error in the type signature.", + "key": "org.scalastyle.scalariform.ThrowChecker", + "name": "No throw statements.", + "params": [ + { + "default": "org.scalastyle.scalariform.ThrowChecker", + "description": "Scalastyle's rule (checker) class name.", + "name": "ruleClass", + "typ": "String" + } + ], + "severity": "Minor", + "template": false + }, { "description": "*Checks that Java @Deprecated is not used, Scala @deprecated should be used instead.*\n\nYou should be using the Scala `@deprecated` instead.", "key": "org.scalastyle.scalariform.DeprecatedJavaChecker", @@ -3537,6 +3552,14 @@ "severity": "Minor", "template": false }, + { + "description": "*Checks that throw is not used.*\n\n`throw` statements should be replaced with type-safe error constructs like `Try` and `Either`, which communicate the possibility of error in the type signature.", + "key": "org.scalastyle.scalariform.ThrowChecker", + "name": "No throw statements.", + "params": [], + "severity": "Minor", + "template": false + }, { "description": "*Checks that Java @Deprecated is not used, Scala @deprecated should be used instead.*\n\nYou should be using the Scala `@deprecated` instead.", "key": "org.scalastyle.scalariform.DeprecatedJavaChecker", diff --git a/src/test/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfileSpec.scala b/src/test/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfileSpec.scala index 2ab97782..eaf0b7dc 100644 --- a/src/test/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfileSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfileSpec.scala @@ -52,8 +52,8 @@ class RecommendedQualityProfileSpec qualityProfile.isDefault shouldBe true } - it should "have 179 rules" in new Ctx { - rules.size shouldBe 179 // 64 from Scalastyle + 115 from Scapegoat + it should "have include all recommended rules" in new Ctx { + rules.size shouldBe 180 // 65 from Scalastyle + 115 from Scapegoat } it should "have all rules come from either the Scalastyle or the Scapegoat rules repositories" in new Ctx { diff --git a/src/test/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfileSpec.scala b/src/test/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfileSpec.scala index 6e5465d4..86147830 100644 --- a/src/test/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfileSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfileSpec.scala @@ -51,7 +51,7 @@ class ScalastyleScapegoatQualityProfileSpec } it should "define all Scalastyle + Scapegoat rules" in new Ctx { - qualityProfile.rules should have size 187 // 69 from Scalastyle + 118 from Scapegoat + qualityProfile.rules should have size 188 // 70 from Scalastyle + 118 from Scapegoat } it should "have all rules come from either the Scalastyle or the Scapegaot rules repositories" in new Ctx { diff --git a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfileSpec.scala b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfileSpec.scala index 1abacc9e..b2ca98bf 100644 --- a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfileSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfileSpec.scala @@ -59,8 +59,8 @@ class ScalastyleQualityProfileSpec extends AnyFlatSpec with Matchers with LoneEl rules.map(_.ruleKey) should contain allElementsOf activated } - it should "have 69 rules" in new Ctx { - rules should have size 69 // 41 default rules + 28 template instances + it should "have all rules" in new Ctx { + rules should have size 70 // 42 default rules + 28 template instances } it should "not activate templates" in new Ctx { diff --git a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepositorySpec.scala b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepositorySpec.scala index c711f78f..7765dd00 100644 --- a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepositorySpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepositorySpec.scala @@ -47,9 +47,9 @@ class ScalastyleRulesRepositorySpec extends AnyFlatSpec with Matchers with Inspe } it should "include all Scalastyle inspections" in new Ctx { - ScalastyleRules.rules.length shouldBe 73 // 31 templates + 42 default rules + ScalastyleRules.rules.length shouldBe 74 // 31 templates + 43 default rules ScalastyleRules.rules.map(r => r.key -> r).iterator.toMap.size shouldBe ScalastyleRules.rules.length - repository.rules should have size 101 // 31 templates + 42 default rules + 28 template instances + repository.rules should have size 102 // 31 templates + 43 default rules + 28 template instances } it should "have all rules with non-empty properties" in new Ctx { From 1ffade2aebf93858ededf8751a7eef433026b86d Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Wed, 16 Sep 2020 23:53:13 +0100 Subject: [PATCH 023/142] Update Scapegoat to 1.4.5. (#522) --- build.sbt | 4 ++-- project/build.sbt | 4 ++-- sonar-scala-metadata.json | 24 +++++++++---------- .../ScalastyleRulesReposotorySpec.scala | 1 - .../sonar/scala/pr/github/GithubSpec.scala | 2 -- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/build.sbt b/build.sbt index 139c0a04..5bf40735 100644 --- a/build.sbt +++ b/build.sbt @@ -28,7 +28,7 @@ headerLicense := Some( excludeFilter.in(headerResources) := "*.scala" // Compile options -scalaVersion := "2.13.1" +scalaVersion := "2.13.3" scalacOptions ++= Seq( "-language:reflectiveCalls", "-Ymacro-annotations", @@ -42,7 +42,7 @@ scalafmtOnCompile in ThisBuild := sys.env .get("DISABLE_SCALAFMT") .forall(_.toLowerCase == "false") -scapegoatVersion in ThisBuild := "1.4.4" +scapegoatVersion in ThisBuild := "1.4.5" scapegoatReports := Seq("xml") coverageOutputXML := true coverageOutputHTML := false diff --git a/project/build.sbt b/project/build.sbt index 8a991678..e10cda91 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,8 +1,8 @@ -scalaVersion := "2.12.10" +scalaVersion := "2.12.11" libraryDependencies ++= Seq( "org.sonarsource.update-center" % "sonar-update-center-common" % "1.25.0.830", // Scapegoat & scalastyle inspections generator dependencies - "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.4", + "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.5", "com.beautiful-scala" %% "scalastyle" % "1.5.0", "org.scalameta" %% "scalameta" % "4.3.22", "org.scalatest" %% "scalatest" % "3.2.2" % Test diff --git a/sonar-scala-metadata.json b/sonar-scala-metadata.json index dce477cd..807fcdc4 100644 --- a/sonar-scala-metadata.json +++ b/sonar-scala-metadata.json @@ -2245,7 +2245,7 @@ "template": false }, { - "description": "*Checks for collection operations that promote the collection to Any.*\n\nThe :+ (append) operator on collections accepts any argument you give it, which means that you can end up with e.g. Seq[Any] if your types don't match.", + "description": "*Checks for collection operations that promote the collection to Any.*\n\nThe `:+` (append) operator on collections accepts any argument you give it, which means that you can end up with e.g. `Seq[Any]` if your types don't match.", "key": "com.sksamuel.scapegoat.inspections.collections.CollectionPromotionToAny", "name": "Collection promotion to Any", "params": [], @@ -2605,7 +2605,7 @@ "template": false }, { - "description": "*Finds type bounds of the form [A <: Any] or [A >: Nothing].*\n\nType bound resolves to Nothing <: T <: Any. Did you mean to put in other bounds?", + "description": "*Finds type bounds of the form `A <: Any` or `A >: Nothing`.*\n\nType bound resolves to `Nothing <: T <: Any`. Did you mean to put in other bounds?", "key": "com.sksamuel.scapegoat.inspections.inference.PointlessTypeBounds", "name": "Pointless type bounds", "params": [], @@ -2613,7 +2613,7 @@ "template": false }, { - "description": "*Checks for use of Map().*\n\nMap[K,V]() allocates an intermediate object. Consider Map.empty which returns a singleton instance without creating a new object.", + "description": "*Checks for use of Map().*\n\n`Map[K,V]()` allocates an intermediate object. Consider `Map.empty` which returns a singleton instance without creating a new object.", "key": "com.sksamuel.scapegoat.inspections.collections.PreferMapEmpty", "name": "Prefer Map.empty", "params": [], @@ -2629,7 +2629,7 @@ "template": false }, { - "description": "*Checks for use of Seq().*\n\nSeq[T]() allocates an intermediate object. Consider Seq.empty which returns a singleton instance without creating a new object.", + "description": "*Checks for use of Seq().*\n\n`Seq[T]()` allocates an intermediate object. Consider `Seq.empty` which returns a singleton instance without creating a new object.", "key": "com.sksamuel.scapegoat.inspections.collections.PreferSeqEmpty", "name": "Prefer Seq.empty", "params": [], @@ -2637,7 +2637,7 @@ "template": false }, { - "description": "*Checks for use of Set().*\n\nSet[T]() allocates an intermediate object. Consider Set.empty which returns a singleton instance without creating a new object.", + "description": "*Checks for use of Set().*\n\n`Set[T]()` allocates an intermediate object. Consider `Set.empty` which returns a singleton instance without creating a new object.", "key": "com.sksamuel.scapegoat.inspections.collections.PreferSetEmpty", "name": "Prefer Set.empty", "params": [], @@ -2853,7 +2853,7 @@ "template": false }, { - "description": "*Checks for use of .get on Left or Right projection.*\n\nMethod .get on a Left and a Right projection in deprecated since 2.13, use Either.getOrElse or Either.swap.getOrElse instead.", + "description": "*Checks for use of .get on Left or Right projection.*\n\nMethod .get on a Left and a Right projection is deprecated since 2.13, use Either.getOrElse or Either.swap.getOrElse instead.", "key": "com.sksamuel.scapegoat.inspections.option.EitherGet", "name": "Use of Either.right or Either.left projection followed by a get", "params": [], @@ -4119,7 +4119,7 @@ "template": false }, { - "description": "*Checks for collection operations that promote the collection to Any.*\n\nThe :+ (append) operator on collections accepts any argument you give it, which means that you can end up with e.g. Seq[Any] if your types don't match.", + "description": "*Checks for collection operations that promote the collection to Any.*\n\nThe `:+` (append) operator on collections accepts any argument you give it, which means that you can end up with e.g. `Seq[Any]` if your types don't match.", "key": "com.sksamuel.scapegoat.inspections.collections.CollectionPromotionToAny", "name": "Collection promotion to Any", "params": [], @@ -4479,7 +4479,7 @@ "template": false }, { - "description": "*Finds type bounds of the form [A <: Any] or [A >: Nothing].*\n\nType bound resolves to Nothing <: T <: Any. Did you mean to put in other bounds?", + "description": "*Finds type bounds of the form `A <: Any` or `A >: Nothing`.*\n\nType bound resolves to `Nothing <: T <: Any`. Did you mean to put in other bounds?", "key": "com.sksamuel.scapegoat.inspections.inference.PointlessTypeBounds", "name": "Pointless type bounds", "params": [], @@ -4487,7 +4487,7 @@ "template": false }, { - "description": "*Checks for use of Map().*\n\nMap[K,V]() allocates an intermediate object. Consider Map.empty which returns a singleton instance without creating a new object.", + "description": "*Checks for use of Map().*\n\n`Map[K,V]()` allocates an intermediate object. Consider `Map.empty` which returns a singleton instance without creating a new object.", "key": "com.sksamuel.scapegoat.inspections.collections.PreferMapEmpty", "name": "Prefer Map.empty", "params": [], @@ -4503,7 +4503,7 @@ "template": false }, { - "description": "*Checks for use of Seq().*\n\nSeq[T]() allocates an intermediate object. Consider Seq.empty which returns a singleton instance without creating a new object.", + "description": "*Checks for use of Seq().*\n\n`Seq[T]()` allocates an intermediate object. Consider `Seq.empty` which returns a singleton instance without creating a new object.", "key": "com.sksamuel.scapegoat.inspections.collections.PreferSeqEmpty", "name": "Prefer Seq.empty", "params": [], @@ -4511,7 +4511,7 @@ "template": false }, { - "description": "*Checks for use of Set().*\n\nSet[T]() allocates an intermediate object. Consider Set.empty which returns a singleton instance without creating a new object.", + "description": "*Checks for use of Set().*\n\n`Set[T]()` allocates an intermediate object. Consider `Set.empty` which returns a singleton instance without creating a new object.", "key": "com.sksamuel.scapegoat.inspections.collections.PreferSetEmpty", "name": "Prefer Set.empty", "params": [], @@ -4727,7 +4727,7 @@ "template": false }, { - "description": "*Checks for use of .get on Left or Right projection.*\n\nMethod .get on a Left and a Right projection in deprecated since 2.13, use Either.getOrElse or Either.swap.getOrElse instead.", + "description": "*Checks for use of .get on Left or Right projection.*\n\nMethod .get on a Left and a Right projection is deprecated since 2.13, use Either.getOrElse or Either.swap.getOrElse instead.", "key": "com.sksamuel.scapegoat.inspections.option.EitherGet", "name": "Use of Either.right or Either.left projection followed by a get", "params": [], diff --git a/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesReposotorySpec.scala b/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesReposotorySpec.scala index 62c964d8..86c0c0fb 100644 --- a/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesReposotorySpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesReposotorySpec.scala @@ -22,7 +22,6 @@ import cats.data.Chain import cats.data.NonEmptyChain import enumeratum.scalacheck._ import org.scalacheck.Prop._ -import org.scalacheck.Prop._ import org.scalacheck.ScalacheckShapeless._ import org.scalacheck._ import org.scalatest.flatspec.AnyFlatSpec diff --git a/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala index cec7cc3d..033c1ebf 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala @@ -26,8 +26,6 @@ import org.http4s.AuthedRoutes import org.http4s.HttpApp import org.http4s.HttpRoutes import org.http4s.Request -import org.http4s.circe.CirceEntityCodec._ -import org.http4s.circe.CirceEntityEncoder._ import org.http4s.client.Client import org.http4s.client.UnexpectedStatus import org.http4s.dsl.io._ From f6e132dfea17f56785baba5ed5f30d3892d1e80c Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 19 Sep 2020 22:14:32 +0200 Subject: [PATCH 024/142] Update scalafmt-core to 2.7.2 (#523) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index b2979fba..c4a74b9e 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "2.7.1" +version = "2.7.2" align = some align { arrowEnumeratorGenerator = false From cb9f121bd6b8cfedc66f097b668912b6cce5e0bc Mon Sep 17 00:00:00 2001 From: Fran Bermejo Date: Sat, 19 Sep 2020 15:10:24 -0700 Subject: [PATCH 025/142] Update SonarQube to 8.4 (#515) --- build.sbt | 2 +- src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 5bf40735..6950d7e8 100644 --- a/build.sbt +++ b/build.sbt @@ -55,7 +55,7 @@ sourceGenerators in Compile ++= Seq( ) // Lib dependencies -val sonarVersion = "8.3.0.34182" +val sonarVersion = "8.4.2.36762" val circe = "0.13.0" val http4s = "0.21.7" libraryDependencies ++= List( diff --git a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala index 21831bca..5f30d352 100755 --- a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala @@ -25,7 +25,7 @@ import org.sonar.api.{Plugin, SonarEdition, SonarQubeSide, SonarRuntime} class ScalaPluginSpec extends AnyFlatSpec with Matchers { val runtime: SonarRuntime = SonarRuntimeImpl.forSonarQube( - Version.create(8, 3), + Version.create(8, 4), SonarQubeSide.SCANNER, SonarEdition.COMMUNITY ) From 4640d59ae27d8c1752ca2b4843064d388e23a5f4 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 19 Sep 2020 23:13:51 +0100 Subject: [PATCH 026/142] Downgrade sonar api to 8.4.0. --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6950d7e8..31b72ec2 100644 --- a/build.sbt +++ b/build.sbt @@ -55,7 +55,7 @@ sourceGenerators in Compile ++= Seq( ) // Lib dependencies -val sonarVersion = "8.4.2.36762" +val sonarVersion = "8.4.0.35506" val circe = "0.13.0" val http4s = "0.21.7" libraryDependencies ++= List( From 08f883089876cfdb57453eafc2bafd2786b30dd7 Mon Sep 17 00:00:00 2001 From: CircleCI Date: Sat, 19 Sep 2020 22:28:10 +0000 Subject: [PATCH 027/142] Setting version to 8.5.0. [ci skip] --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index d93832fc..a47d3930 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "8.5.0-SNAPSHOT" +version in ThisBuild := "8.5.0" From 0b4a376bcfafe533df96267201a3c71bfda99575 Mon Sep 17 00:00:00 2001 From: CircleCI Date: Sat, 19 Sep 2020 22:29:36 +0000 Subject: [PATCH 028/142] Setting version to 8.6.0-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index a47d3930..c0e89d80 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "8.5.0" +version in ThisBuild := "8.6.0-SNAPSHOT" From 79a29798d4fdbde6e91a100e05d9b9eec392e894 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 19 Sep 2020 23:31:31 +0100 Subject: [PATCH 029/142] Update readme. --- README.md | 11 ++++++++--- README.tpl.md | 7 ++++++- vars.json | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 34b03c6a..ade86701 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,11 @@ [![circleci-badge]][circleci] [![coverage-badge]][coverage] [![bintray-badge]][bintray] [![bintray-badge-lts]][bintray-lts] [![bintray-badge-lts-67]][bintray-lts-67] +[![bintray-badge-downloads]][bintray-downloads] [![bintray-stats-badge]][bintray-stats] [![gitter-badge]][gitter] -[bintray]: https://bintray.com/mwz/maven/sonar-scala/8.4.0/link -[bintray-badge]: https://img.shields.io/badge/Download-8.4.0-blue.svg +[bintray]: https://bintray.com/mwz/maven/sonar-scala/8.5.0/link +[bintray-badge]: https://img.shields.io/badge/Download-8.5.0-blue.svg [bintray-badge-lts]: https://img.shields.io/badge/Download-7.9.0_(for_SonarQube_7.9_LTS)-blue.svg [bintray-badge-lts-67]: @@ -14,6 +15,10 @@ [bintray-lts]: https://bintray.com/mwz/maven/sonar-scala/7.9.0/link [bintray-lts-67]: https://bintray.com/mwz/maven/sonar-scala/6.8.0/link +[bintray-downloads]: + https://bintray.com/beta/#/mwz/maven/sonar-scala?tab=statistics +[bintray-badge-downloads]: + https://img.shields.io/bintray/dt/mwz/maven/sonar-scala?label=Downloads [bintray-stats]: https://bintray.com/mwz/maven/sonar-scala#statistics [bintray-stats-badge]: https://img.shields.io/badge/dynamic/json.svg?uri=https://bintray.com/statistics/packageStatistics?pkgPath=/mwz/maven/sonar-scala&query=$.totalDownloads&label=Downloads+(last+30+days)&colorB=green @@ -37,7 +42,7 @@ sonar-scala is an independent SonarQube plugin, driven by and developed with Intended for [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts), [SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts), -[SonarQube 8.2](https://www.sonarqube.org/sonarqube-8-2) and Scala +[SonarQube 8.4](https://www.sonarqube.org/sonarqube-8-4) and Scala 2.11/2.12/2.13. sonar-scala is developed in Scala. It uses the diff --git a/README.tpl.md b/README.tpl.md index 0d3a4ba0..3034572c 100644 --- a/README.tpl.md +++ b/README.tpl.md @@ -3,6 +3,7 @@ [![circleci-badge]][circleci] [![coverage-badge]][coverage] [![bintray-badge]][bintray] [![bintray-badge-lts]][bintray-lts] [![bintray-badge-lts-67]][bintray-lts-67] +[![bintray-badge-downloads]][bintray-downloads] [![bintray-stats-badge]][bintray-stats] [![gitter-badge]][gitter] [bintray]: https://bintray.com/mwz/maven/sonar-scala/{{version}}/link @@ -14,6 +15,10 @@ [bintray-lts]: https://bintray.com/mwz/maven/sonar-scala/{{ltsVersion}}/link [bintray-lts-67]: https://bintray.com/mwz/maven/sonar-scala/{{lts67Version}}/link +[bintray-downloads]: + https://bintray.com/beta/#/mwz/maven/sonar-scala?tab=statistics +[bintray-badge-downloads]: + https://img.shields.io/bintray/dt/mwz/maven/sonar-scala?label=Downloads [bintray-stats]: https://bintray.com/mwz/maven/sonar-scala#statistics [bintray-stats-badge]: https://img.shields.io/badge/dynamic/json.svg?uri=https://bintray.com/statistics/packageStatistics?pkgPath=/mwz/maven/sonar-scala&query=$.totalDownloads&label=Downloads+(last+30+days)&colorB=green @@ -37,7 +42,7 @@ sonar-scala is an independent SonarQube plugin, driven by and developed with Intended for [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts), [SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts), -[SonarQube 8.2](https://www.sonarqube.org/sonarqube-8-2) and Scala +[SonarQube 8.4](https://www.sonarqube.org/sonarqube-8-4) and Scala 2.11/2.12/2.13. sonar-scala is developed in Scala. It uses the diff --git a/vars.json b/vars.json index da53bcc6..853e6e35 100644 --- a/vars.json +++ b/vars.json @@ -1,5 +1,5 @@ { - "version": "8.4.0", + "version": "8.5.0", "ltsVersion": "7.9.0", "lts67Version": "6.8.0" } From 0a4b7c79792317ae978a602cb98ac991a30b98f6 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 2 Oct 2020 00:50:16 +0200 Subject: [PATCH 030/142] Update sbtplugin to 1.1.11 (#529) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index fd76c8c9..3200290f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") addSbtPlugin("com.github.mwz" % "sbt-sonar" % "2.2.0") -addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.10") +addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.11") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.20") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") From aa04a2d31dc9f44778e6f22b40a815cc20849346 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 2 Oct 2020 00:50:47 +0200 Subject: [PATCH 031/142] Update mockito-scala to 1.15.1 (#526) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 31b72ec2..c1aa9ea3 100644 --- a/build.sbt +++ b/build.sbt @@ -80,7 +80,7 @@ libraryDependencies ++= List( "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5" % Test, "org.http4s" %% "http4s-blaze-server" % http4s % Test, "org.http4s" %% "http4s-dsl" % http4s % Test, - "org.mockito" %% "mockito-scala" % "1.15.0" % Test, + "org.mockito" %% "mockito-scala" % "1.15.1" % Test, "org.scalacheck" %% "scalacheck" % "1.14.3" % Test, "org.scalatest" %% "scalatest" % "3.2.2" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, From 01134f89193ae5c9b3893eb42c212e4088b560b0 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 2 Oct 2020 00:51:10 +0200 Subject: [PATCH 032/142] Update sbt-scalafix to 0.9.21 (#525) [ci skip] --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 3200290f..21aa1f7a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,5 +8,5 @@ addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") addSbtPlugin("com.github.mwz" % "sbt-sonar" % "2.2.0") addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.11") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.20") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.21") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") From 1b68ae848b3f71ddef1d37d3d9b5dae07098aa26 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 2 Oct 2020 00:51:23 +0200 Subject: [PATCH 033/142] Update scalafmt-core to 2.7.3 (#528) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index c4a74b9e..bf3e5219 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "2.7.2" +version = "2.7.3" align = some align { arrowEnumeratorGenerator = false From 5a8b36aa9efed660080e47ab58d1e6c446b91dfe Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 2 Oct 2020 00:54:46 +0200 Subject: [PATCH 034/142] Update scalac-scapegoat-plugin_2.12.11 to 1.4.6 (#527) --- build.sbt | 2 +- project/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index c1aa9ea3..4481a66d 100644 --- a/build.sbt +++ b/build.sbt @@ -42,7 +42,7 @@ scalafmtOnCompile in ThisBuild := sys.env .get("DISABLE_SCALAFMT") .forall(_.toLowerCase == "false") -scapegoatVersion in ThisBuild := "1.4.5" +scapegoatVersion in ThisBuild := "1.4.6" scapegoatReports := Seq("xml") coverageOutputXML := true coverageOutputHTML := false diff --git a/project/build.sbt b/project/build.sbt index e10cda91..93293e26 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -2,7 +2,7 @@ scalaVersion := "2.12.11" libraryDependencies ++= Seq( "org.sonarsource.update-center" % "sonar-update-center-common" % "1.25.0.830", // Scapegoat & scalastyle inspections generator dependencies - "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.5", + "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.6", "com.beautiful-scala" %% "scalastyle" % "1.5.0", "org.scalameta" %% "scalameta" % "4.3.22", "org.scalatest" %% "scalatest" % "3.2.2" % Test From 726a5a30b6971930ca4e3b6a57be0aa1288cb5d4 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 22 Nov 2020 01:03:15 +0100 Subject: [PATCH 035/142] Update scalameta, semanticdb-scalac to 4.3.24 (#533) [ci skip] --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index 93293e26..dc2d545e 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -4,7 +4,7 @@ libraryDependencies ++= Seq( // Scapegoat & scalastyle inspections generator dependencies "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.6", "com.beautiful-scala" %% "scalastyle" % "1.5.0", - "org.scalameta" %% "scalameta" % "4.3.22", + "org.scalameta" %% "scalameta" % "4.3.24", "org.scalatest" %% "scalatest" % "3.2.2" % Test ) From aaa36880cf1d072aa782a2df9e0fcbdede8d4fa5 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 22 Nov 2020 01:03:47 +0100 Subject: [PATCH 036/142] Update scalafmt-core to 2.7.5 (#538) [ci skip] --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index bf3e5219..33a8eeea 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "2.7.3" +version = "2.7.5" align = some align { arrowEnumeratorGenerator = false From 1b42c99063dbd2953baf2d827441f6bece551d82 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 22 Nov 2020 01:04:41 +0100 Subject: [PATCH 037/142] Update sbt-bintray to 0.6.1 (#542) [ci skip] --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 21aa1f7a..f6832fc5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.13") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13") -addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.6") +addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.6.1") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") addSbtPlugin("com.github.mwz" % "sbt-sonar" % "2.2.0") From 5c42e2c00c369ced1ec0a0bca0269e4fe835738d Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 22 Nov 2020 01:05:18 +0100 Subject: [PATCH 038/142] Update sbt-scalafix to 0.9.23 (#544) [ci skip] --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f6832fc5..7a35ca69 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,5 +8,5 @@ addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") addSbtPlugin("com.github.mwz" % "sbt-sonar" % "2.2.0") addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.11") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.21") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.23") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") From 00418e77f5eca316a5defe2228d6ac4cdb0e279e Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 22 Nov 2020 01:05:48 +0100 Subject: [PATCH 039/142] Update sort-imports to 0.5.5 (#545) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 4481a66d..5c60cb43 100644 --- a/build.sbt +++ b/build.sbt @@ -174,7 +174,7 @@ logBuffered in Test := false testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-oDTF") // scalafix -scalafixDependencies in ThisBuild += "com.nequissimus" %% "sort-imports" % "0.5.4" +scalafixDependencies in ThisBuild += "com.nequissimus" %% "sort-imports" % "0.5.5" addCommandAlias("fix", "all compile:scalafix test:scalafix; fixImports") addCommandAlias("fixImports", "compile:scalafix SortImports; test:scalafix SortImports") addCommandAlias("fixCheck", "compile:scalafix --check; test:scalafix --check; fixCheckImports") From 0c0d7684f883c0111782e46b9c830078a65d7612 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 22 Nov 2020 01:06:33 +0100 Subject: [PATCH 040/142] Update sbt-tpolecat to 0.1.15 (#549) [ci skip] --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7a35ca69..e714b812 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.13") +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.15") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13") From db155341ed3637ade3ef5d25f2e9b56b86ccfd98 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 22 Nov 2020 01:07:24 +0100 Subject: [PATCH 041/142] Update mockito-scala to 1.16.3 (#552) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 5c60cb43..9f20cc92 100644 --- a/build.sbt +++ b/build.sbt @@ -80,7 +80,7 @@ libraryDependencies ++= List( "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5" % Test, "org.http4s" %% "http4s-blaze-server" % http4s % Test, "org.http4s" %% "http4s-dsl" % http4s % Test, - "org.mockito" %% "mockito-scala" % "1.15.1" % Test, + "org.mockito" %% "mockito-scala" % "1.16.3" % Test, "org.scalacheck" %% "scalacheck" % "1.14.3" % Test, "org.scalatest" %% "scalatest" % "3.2.2" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, From 34b8ed08538f3fc26e9fa0b8d3f14e97f3386c34 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 22 Nov 2020 01:11:11 +0100 Subject: [PATCH 042/142] Update http4s-blaze-client, ... to 0.21.11 (#554) [ci skip] Co-authored-by: Michael Wizner --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9f20cc92..e828e5fc 100644 --- a/build.sbt +++ b/build.sbt @@ -57,7 +57,7 @@ sourceGenerators in Compile ++= Seq( // Lib dependencies val sonarVersion = "8.4.0.35506" val circe = "0.13.0" -val http4s = "0.21.7" +val http4s = "0.21.11" libraryDependencies ++= List( "com.beachape" %% "enumeratum" % "1.6.1", "com.beachape" %% "enumeratum-cats" % "1.6.1", From 2fbaee10cb683deb4e511b9af812967d2f8c1a8b Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 22 Nov 2020 01:13:12 +0100 Subject: [PATCH 043/142] Update scalatest to 3.2.3 (#548) [ci skip] Co-authored-by: Michael Wizner --- build.sbt | 2 +- examples/sbt/multi-module/build.sbt | 2 +- examples/sbt/single-module/build.sbt | 2 +- project/build.sbt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index e828e5fc..66fcafe4 100644 --- a/build.sbt +++ b/build.sbt @@ -82,7 +82,7 @@ libraryDependencies ++= List( "org.http4s" %% "http4s-dsl" % http4s % Test, "org.mockito" %% "mockito-scala" % "1.16.3" % Test, "org.scalacheck" %% "scalacheck" % "1.14.3" % Test, - "org.scalatest" %% "scalatest" % "3.2.2" % Test, + "org.scalatest" %% "scalatest" % "3.2.3" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test, "com.softwaremill.diffx" %% "diffx-scalatest" % "0.3.29" % Test, diff --git a/examples/sbt/multi-module/build.sbt b/examples/sbt/multi-module/build.sbt index 25a17e91..0a9ff906 100644 --- a/examples/sbt/multi-module/build.sbt +++ b/examples/sbt/multi-module/build.sbt @@ -1,6 +1,6 @@ lazy val baseSettings = Seq( scalaVersion := "2.12.8", - libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.2" % "test", + libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.3" % "test", scapegoatVersion in ThisBuild := "1.3.9" ) diff --git a/examples/sbt/single-module/build.sbt b/examples/sbt/single-module/build.sbt index 5ee4b192..c2ec3109 100644 --- a/examples/sbt/single-module/build.sbt +++ b/examples/sbt/single-module/build.sbt @@ -1,4 +1,4 @@ name := "sbt-single-module" scalaVersion := "2.12.8" -libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.2" % "test" +libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.3" % "test" scapegoatVersion in ThisBuild := "1.3.9" diff --git a/project/build.sbt b/project/build.sbt index dc2d545e..d6cceda0 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -5,7 +5,7 @@ libraryDependencies ++= Seq( "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.6", "com.beautiful-scala" %% "scalastyle" % "1.5.0", "org.scalameta" %% "scalameta" % "4.3.24", - "org.scalatest" %% "scalatest" % "3.2.2" % Test + "org.scalatest" %% "scalatest" % "3.2.3" % Test ) // Adding a resolver to the Artima maven repo, so sbt can download the Artima SuperSafe sbt plugin From c00659fac8011b9b3af954375ed33d1e3b1ae89c Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 22 Nov 2020 01:14:23 +0100 Subject: [PATCH 044/142] Update scalacheck to 1.15.1 (#546) [ci skip] Co-authored-by: Michael Wizner --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 66fcafe4..61de139f 100644 --- a/build.sbt +++ b/build.sbt @@ -81,7 +81,7 @@ libraryDependencies ++= List( "org.http4s" %% "http4s-blaze-server" % http4s % Test, "org.http4s" %% "http4s-dsl" % http4s % Test, "org.mockito" %% "mockito-scala" % "1.16.3" % Test, - "org.scalacheck" %% "scalacheck" % "1.14.3" % Test, + "org.scalacheck" %% "scalacheck" % "1.15.1" % Test, "org.scalatest" %% "scalatest" % "3.2.3" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test, From fb7896df7544f1c782103539d4fadaa0cd4e2807 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Nov 2020 00:15:08 +0000 Subject: [PATCH 045/142] Bump junit from 4.12 to 4.13.1 in /examples (#536) [ci skip] Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- examples/mvn/scala-java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/mvn/scala-java/pom.xml b/examples/mvn/scala-java/pom.xml index e035e6fc..ee7a0f3d 100644 --- a/examples/mvn/scala-java/pom.xml +++ b/examples/mvn/scala-java/pom.xml @@ -42,7 +42,7 @@ junit junit - 4.12 + 4.13.1 test From c6891cbe0d5497b2cdb843c17a95cbea7b90cdcc Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 22 Nov 2020 01:21:10 +0100 Subject: [PATCH 046/142] Update sbt to 1.4.3 (#553) Co-authored-by: Michael Wizner --- examples/sbt/multi-module/project/build.properties | 2 +- examples/sbt/single-module/project/build.properties | 2 +- project/build.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sbt/multi-module/project/build.properties b/examples/sbt/multi-module/project/build.properties index 0837f7a1..947bdd30 100644 --- a/examples/sbt/multi-module/project/build.properties +++ b/examples/sbt/multi-module/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.13 +sbt.version=1.4.3 diff --git a/examples/sbt/single-module/project/build.properties b/examples/sbt/single-module/project/build.properties index 0837f7a1..947bdd30 100644 --- a/examples/sbt/single-module/project/build.properties +++ b/examples/sbt/single-module/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.13 +sbt.version=1.4.3 diff --git a/project/build.properties b/project/build.properties index 0837f7a1..947bdd30 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.13 +sbt.version=1.4.3 From 6c0ce2c394c1c6d95a5f945e3529e452bc8ce757 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 23 Nov 2020 18:04:41 +0100 Subject: [PATCH 047/142] Update scalameta, semanticdb-scalac to 4.4.0 (#555) [ci skip] --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index d6cceda0..82aa182c 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -4,7 +4,7 @@ libraryDependencies ++= Seq( // Scapegoat & scalastyle inspections generator dependencies "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.6", "com.beautiful-scala" %% "scalastyle" % "1.5.0", - "org.scalameta" %% "scalameta" % "4.3.24", + "org.scalameta" %% "scalameta" % "4.4.0", "org.scalatest" %% "scalatest" % "3.2.3" % Test ) From 5571f1bcf0e533740974ecb80c8cff1a468a196d Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 23 Nov 2020 18:05:19 +0100 Subject: [PATCH 048/142] Update diffx-scalatest to 0.3.30 (#556) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 61de139f..09ee6063 100644 --- a/build.sbt +++ b/build.sbt @@ -85,7 +85,7 @@ libraryDependencies ++= List( "org.scalatest" %% "scalatest" % "3.2.3" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test, - "com.softwaremill.diffx" %% "diffx-scalatest" % "0.3.29" % Test, + "com.softwaremill.diffx" %% "diffx-scalatest" % "0.3.30" % Test, "org.sonarsource.sonarqube" % "sonar-plugin-api-impl" % sonarVersion % Test ) From 00a2f1dc7ab11e9da3e6bbe7dcaf00df19e35899 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 23 Nov 2020 18:06:13 +0100 Subject: [PATCH 049/142] Update sbt to 1.4.4 (#557) --- examples/sbt/multi-module/project/build.properties | 2 +- examples/sbt/single-module/project/build.properties | 2 +- project/build.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sbt/multi-module/project/build.properties b/examples/sbt/multi-module/project/build.properties index 947bdd30..7de0a938 100644 --- a/examples/sbt/multi-module/project/build.properties +++ b/examples/sbt/multi-module/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.3 +sbt.version=1.4.4 diff --git a/examples/sbt/single-module/project/build.properties b/examples/sbt/single-module/project/build.properties index 947bdd30..7de0a938 100644 --- a/examples/sbt/single-module/project/build.properties +++ b/examples/sbt/single-module/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.3 +sbt.version=1.4.4 diff --git a/project/build.properties b/project/build.properties index 947bdd30..7de0a938 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.3 +sbt.version=1.4.4 From cf7c9ea2c71c7a42aacdcb47b26cc3a01293e5f7 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 28 Nov 2020 23:53:01 +0000 Subject: [PATCH 050/142] Update SonarQube to 8.5. (#558) --- .gitignore | 6 +++++- build.sbt | 2 +- src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a618fb9d..c89ae649 100644 --- a/.gitignore +++ b/.gitignore @@ -18,8 +18,9 @@ project/plugins/project/ .cache # metals -.metals .bloop +.bsp +.metals metals.sbt # Intellij IDEA Specific @@ -28,6 +29,9 @@ metals.sbt *.ipr *.iml +# VSCode +.vscode + # sonar-scanner .scannerwork/ diff --git a/build.sbt b/build.sbt index 09ee6063..399cd180 100644 --- a/build.sbt +++ b/build.sbt @@ -55,7 +55,7 @@ sourceGenerators in Compile ++= Seq( ) // Lib dependencies -val sonarVersion = "8.4.0.35506" +val sonarVersion = "8.5.0.37579" val circe = "0.13.0" val http4s = "0.21.11" libraryDependencies ++= List( diff --git a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala index 5f30d352..9464aecd 100755 --- a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala @@ -25,7 +25,7 @@ import org.sonar.api.{Plugin, SonarEdition, SonarQubeSide, SonarRuntime} class ScalaPluginSpec extends AnyFlatSpec with Matchers { val runtime: SonarRuntime = SonarRuntimeImpl.forSonarQube( - Version.create(8, 4), + Version.create(8, 5), SonarQubeSide.SCANNER, SonarEdition.COMMUNITY ) From 91de1ffb7c34e86d5a8789aea83e29f7d328eb6d Mon Sep 17 00:00:00 2001 From: CircleCI Date: Sun, 29 Nov 2020 00:03:47 +0000 Subject: [PATCH 051/142] Setting version to 8.6.0. [ci skip] --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index c0e89d80..3b29ec3d 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "8.6.0-SNAPSHOT" +version in ThisBuild := "8.6.0" From 8e21f848a90f6680ebcf387cc8c760d00eaf45ea Mon Sep 17 00:00:00 2001 From: CircleCI Date: Sun, 29 Nov 2020 00:04:54 +0000 Subject: [PATCH 052/142] Setting version to 8.7.0-SNAPSHOT --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 3b29ec3d..acca209d 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "8.6.0" +version in ThisBuild := "8.7.0-SNAPSHOT" From 2df0106ca348b056450e96251f115b00d9ea9789 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Dec 2020 23:53:58 +0100 Subject: [PATCH 053/142] Update sbt to 1.4.5 (#572) [ci skip] --- examples/sbt/multi-module/project/build.properties | 2 +- examples/sbt/single-module/project/build.properties | 2 +- project/build.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sbt/multi-module/project/build.properties b/examples/sbt/multi-module/project/build.properties index 7de0a938..c06db1bb 100644 --- a/examples/sbt/multi-module/project/build.properties +++ b/examples/sbt/multi-module/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.4 +sbt.version=1.4.5 diff --git a/examples/sbt/single-module/project/build.properties b/examples/sbt/single-module/project/build.properties index 7de0a938..c06db1bb 100644 --- a/examples/sbt/single-module/project/build.properties +++ b/examples/sbt/single-module/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.4 +sbt.version=1.4.5 diff --git a/project/build.properties b/project/build.properties index 7de0a938..c06db1bb 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.4 +sbt.version=1.4.5 From 26d681c9b2e6f46cd3c998c86bc4b64ace4acd4f Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Dec 2020 23:54:36 +0100 Subject: [PATCH 054/142] Update sbt-tpolecat to 0.1.16 (#568) [ci skip] --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e714b812..7a19a70a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.15") +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13") From 480388201106f3c0ca21d3745a2b267f5cb0bf82 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Dec 2020 23:54:50 +0100 Subject: [PATCH 055/142] Update mouse to 0.26.2 (#567) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 399cd180..8662154a 100644 --- a/build.sbt +++ b/build.sbt @@ -74,7 +74,7 @@ libraryDependencies ++= List( "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, "org.typelevel" %% "cats-core" % "2.2.0", "org.typelevel" %% "cats-effect" % "2.2.0", - "org.typelevel" %% "mouse" % "0.25", + "org.typelevel" %% "mouse" % "0.26.2", // TEST "com.beachape" %% "enumeratum-scalacheck" % "1.6.1" % Test, "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5" % Test, From d1a71cda42277184effb7bed908e17b744e36219 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Dec 2020 23:55:09 +0100 Subject: [PATCH 056/142] Update sbt-scalafix to 0.9.24 (#563) [ci skip] --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7a19a70a..fa026c97 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,5 +8,5 @@ addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") addSbtPlugin("com.github.mwz" % "sbt-sonar" % "2.2.0") addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.11") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.23") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.24") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") From 86ee18fb225f0f5c0d5a159c286a0746aa3882c8 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Dec 2020 23:55:32 +0100 Subject: [PATCH 057/142] Update sbtplugin to 1.1.12 (#559) [ci skip] --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index fa026c97..67ec952b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.6.1") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") addSbtPlugin("com.github.mwz" % "sbt-sonar" % "2.2.0") -addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.11") +addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.12") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.24") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") From d82b87b21c8e103a177d7ee3cd6a03464a278899 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Dec 2020 23:56:05 +0100 Subject: [PATCH 058/142] Update http4s-blaze-client, ... to 0.21.14 (#571) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8662154a..d33fa762 100644 --- a/build.sbt +++ b/build.sbt @@ -57,7 +57,7 @@ sourceGenerators in Compile ++= Seq( // Lib dependencies val sonarVersion = "8.5.0.37579" val circe = "0.13.0" -val http4s = "0.21.11" +val http4s = "0.21.14" libraryDependencies ++= List( "com.beachape" %% "enumeratum" % "1.6.1", "com.beachape" %% "enumeratum-cats" % "1.6.1", From b250c07b067472a30b8f3a3c5f24633890b3a081 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Dec 2020 23:56:36 +0100 Subject: [PATCH 059/142] Update scalameta to 4.4.2 (#570) [ci skip] --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index 82aa182c..43903053 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -4,7 +4,7 @@ libraryDependencies ++= Seq( // Scapegoat & scalastyle inspections generator dependencies "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.6", "com.beautiful-scala" %% "scalastyle" % "1.5.0", - "org.scalameta" %% "scalameta" % "4.4.0", + "org.scalameta" %% "scalameta" % "4.4.2", "org.scalatest" %% "scalatest" % "3.2.3" % Test ) From 47606a50ebe528d1557bb8400395c0426666c640 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Dec 2020 23:57:22 +0100 Subject: [PATCH 060/142] Update cats-effect to 2.3.0 (#564) [ci skip] Co-authored-by: Michael Wizner --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d33fa762..6146b7f4 100644 --- a/build.sbt +++ b/build.sbt @@ -73,7 +73,7 @@ libraryDependencies ++= List( "org.slf4j" % "slf4j-api" % "1.7.30" % Provided, "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, "org.typelevel" %% "cats-core" % "2.2.0", - "org.typelevel" %% "cats-effect" % "2.2.0", + "org.typelevel" %% "cats-effect" % "2.3.0", "org.typelevel" %% "mouse" % "0.26.2", // TEST "com.beachape" %% "enumeratum-scalacheck" % "1.6.1" % Test, From 7657c6acfe1d5b09ae77fe1d77043480687dda45 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 16 Dec 2020 23:58:36 +0100 Subject: [PATCH 061/142] Update cats-core to 2.3.0 (#562) Co-authored-by: Michael Wizner --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6146b7f4..059ded45 100644 --- a/build.sbt +++ b/build.sbt @@ -72,7 +72,7 @@ libraryDependencies ++= List( "org.scalariform" %% "scalariform" % "0.2.10", "org.slf4j" % "slf4j-api" % "1.7.30" % Provided, "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, - "org.typelevel" %% "cats-core" % "2.2.0", + "org.typelevel" %% "cats-core" % "2.3.0", "org.typelevel" %% "cats-effect" % "2.3.0", "org.typelevel" %% "mouse" % "0.26.2", // TEST From 27a7179a045c7e1f3284e934fe79001833c3add9 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Wed, 16 Dec 2020 23:14:33 +0000 Subject: [PATCH 062/142] Update readme. --- README.md | 6 +++--- README.tpl.md | 2 +- vars.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ade86701..5924488d 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ [![bintray-badge-downloads]][bintray-downloads] [![bintray-stats-badge]][bintray-stats] [![gitter-badge]][gitter] -[bintray]: https://bintray.com/mwz/maven/sonar-scala/8.5.0/link -[bintray-badge]: https://img.shields.io/badge/Download-8.5.0-blue.svg +[bintray]: https://bintray.com/mwz/maven/sonar-scala/8.6.0/link +[bintray-badge]: https://img.shields.io/badge/Download-8.6.0-blue.svg [bintray-badge-lts]: https://img.shields.io/badge/Download-7.9.0_(for_SonarQube_7.9_LTS)-blue.svg [bintray-badge-lts-67]: @@ -42,7 +42,7 @@ sonar-scala is an independent SonarQube plugin, driven by and developed with Intended for [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts), [SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts), -[SonarQube 8.4](https://www.sonarqube.org/sonarqube-8-4) and Scala +[SonarQube 8.5](https://www.sonarqube.org/sonarqube-8-5) and Scala 2.11/2.12/2.13. sonar-scala is developed in Scala. It uses the diff --git a/README.tpl.md b/README.tpl.md index 3034572c..2b3b2daf 100644 --- a/README.tpl.md +++ b/README.tpl.md @@ -42,7 +42,7 @@ sonar-scala is an independent SonarQube plugin, driven by and developed with Intended for [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts), [SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts), -[SonarQube 8.4](https://www.sonarqube.org/sonarqube-8-4) and Scala +[SonarQube 8.5](https://www.sonarqube.org/sonarqube-8-5) and Scala 2.11/2.12/2.13. sonar-scala is developed in Scala. It uses the diff --git a/vars.json b/vars.json index 853e6e35..d8131995 100644 --- a/vars.json +++ b/vars.json @@ -1,5 +1,5 @@ { - "version": "8.5.0", + "version": "8.6.0", "ltsVersion": "7.9.0", "lts67Version": "6.8.0" } From 20723d6f10e9240b69af571248584a0135f4c457 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 19 Dec 2020 00:09:15 +0100 Subject: [PATCH 063/142] Update scalacheck to 1.15.2 (#573) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 059ded45..bc8660a5 100644 --- a/build.sbt +++ b/build.sbt @@ -81,7 +81,7 @@ libraryDependencies ++= List( "org.http4s" %% "http4s-blaze-server" % http4s % Test, "org.http4s" %% "http4s-dsl" % http4s % Test, "org.mockito" %% "mockito-scala" % "1.16.3" % Test, - "org.scalacheck" %% "scalacheck" % "1.15.1" % Test, + "org.scalacheck" %% "scalacheck" % "1.15.2" % Test, "org.scalatest" %% "scalatest" % "3.2.3" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test, From a5139fd31d06899fe6a398524b219e96df60de3e Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 19 Dec 2020 00:10:41 +0100 Subject: [PATCH 064/142] Update cats-core, cats-effect to 2.3.1 (#574) --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index bc8660a5..931d3fc5 100644 --- a/build.sbt +++ b/build.sbt @@ -72,8 +72,8 @@ libraryDependencies ++= List( "org.scalariform" %% "scalariform" % "0.2.10", "org.slf4j" % "slf4j-api" % "1.7.30" % Provided, "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, - "org.typelevel" %% "cats-core" % "2.3.0", - "org.typelevel" %% "cats-effect" % "2.3.0", + "org.typelevel" %% "cats-core" % "2.3.1", + "org.typelevel" %% "cats-effect" % "2.3.1", "org.typelevel" %% "mouse" % "0.26.2", // TEST "com.beachape" %% "enumeratum-scalacheck" % "1.6.1" % Test, From e8b7aa5e07a0c07ec6e10348e4509f9f6ec5a50a Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 21 Dec 2020 19:46:23 +0100 Subject: [PATCH 065/142] Update scalameta to 4.4.3 (#576) --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index 43903053..589b5fb2 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -4,7 +4,7 @@ libraryDependencies ++= Seq( // Scapegoat & scalastyle inspections generator dependencies "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.6", "com.beautiful-scala" %% "scalastyle" % "1.5.0", - "org.scalameta" %% "scalameta" % "4.4.2", + "org.scalameta" %% "scalameta" % "4.4.3", "org.scalatest" %% "scalatest" % "3.2.3" % Test ) From 9e7c1cebefa147c5bcf02f6aba32d87c9c5e4724 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 6 Mar 2021 23:52:54 +0100 Subject: [PATCH 066/142] Update sbt to 1.4.7 (#593) --- examples/sbt/multi-module/project/build.properties | 2 +- examples/sbt/single-module/project/build.properties | 2 +- project/build.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sbt/multi-module/project/build.properties b/examples/sbt/multi-module/project/build.properties index c06db1bb..0b2e09c5 100644 --- a/examples/sbt/multi-module/project/build.properties +++ b/examples/sbt/multi-module/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.5 +sbt.version=1.4.7 diff --git a/examples/sbt/single-module/project/build.properties b/examples/sbt/single-module/project/build.properties index c06db1bb..0b2e09c5 100644 --- a/examples/sbt/single-module/project/build.properties +++ b/examples/sbt/single-module/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.5 +sbt.version=1.4.7 diff --git a/project/build.properties b/project/build.properties index c06db1bb..0b2e09c5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.5 +sbt.version=1.4.7 From 707369f4f13445501515604c94a74632328b3918 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 6 Mar 2021 23:53:11 +0100 Subject: [PATCH 067/142] Update scalacheck to 1.15.3 (#605) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 931d3fc5..79571089 100644 --- a/build.sbt +++ b/build.sbt @@ -81,7 +81,7 @@ libraryDependencies ++= List( "org.http4s" %% "http4s-blaze-server" % http4s % Test, "org.http4s" %% "http4s-dsl" % http4s % Test, "org.mockito" %% "mockito-scala" % "1.16.3" % Test, - "org.scalacheck" %% "scalacheck" % "1.15.2" % Test, + "org.scalacheck" %% "scalacheck" % "1.15.3" % Test, "org.scalatest" %% "scalatest" % "3.2.3" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test, From 7044e3761f3e562513468490344ac57dd5ee881e Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 6 Mar 2021 23:53:34 +0100 Subject: [PATCH 068/142] Update sbt-release to 1.0.15 (#613) [ci skip] --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 67ec952b..36d06ec7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") -addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15") addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.6.1") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") From 418c20943539b3702ea2f27c8e3d9e0fff471fac Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 6 Mar 2021 23:53:58 +0100 Subject: [PATCH 069/142] Update scalameta to 4.4.10 (#614) [ci skip] --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index 589b5fb2..7773870d 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -4,7 +4,7 @@ libraryDependencies ++= Seq( // Scapegoat & scalastyle inspections generator dependencies "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.6", "com.beautiful-scala" %% "scalastyle" % "1.5.0", - "org.scalameta" %% "scalameta" % "4.4.3", + "org.scalameta" %% "scalameta" % "4.4.10", "org.scalatest" %% "scalatest" % "3.2.3" % Test ) From 746a2e28b6b1fc50ad5f17133b67e44c44676262 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 6 Mar 2021 23:55:13 +0100 Subject: [PATCH 070/142] Update sbt-scalafix to 0.9.26 (#619) [ci skip] --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 36d06ec7..c290ab9a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,5 +8,5 @@ addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") addSbtPlugin("com.github.mwz" % "sbt-sonar" % "2.2.0") addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.12") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.24") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.26") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") From fa0b2399041f079d15fdf44fe4a7f80aa2b68101 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 6 Mar 2021 23:55:33 +0100 Subject: [PATCH 071/142] Update http4s-blaze-client, ... to 0.21.20 (#622) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 79571089..48cfb7c5 100644 --- a/build.sbt +++ b/build.sbt @@ -57,7 +57,7 @@ sourceGenerators in Compile ++= Seq( // Lib dependencies val sonarVersion = "8.5.0.37579" val circe = "0.13.0" -val http4s = "0.21.14" +val http4s = "0.21.20" libraryDependencies ++= List( "com.beachape" %% "enumeratum" % "1.6.1", "com.beachape" %% "enumeratum-cats" % "1.6.1", From 793f7bbc681c7939f18f19460e24190fbf48f406 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 6 Mar 2021 23:56:14 +0100 Subject: [PATCH 072/142] Update mouse to 1.0.0 (#623) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 48cfb7c5..63fc1c51 100644 --- a/build.sbt +++ b/build.sbt @@ -74,7 +74,7 @@ libraryDependencies ++= List( "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, "org.typelevel" %% "cats-core" % "2.3.1", "org.typelevel" %% "cats-effect" % "2.3.1", - "org.typelevel" %% "mouse" % "0.26.2", + "org.typelevel" %% "mouse" % "1.0.0", // TEST "com.beachape" %% "enumeratum-scalacheck" % "1.6.1" % Test, "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5" % Test, From 2bbcdc35973fa70eafaa5421643fbb7ce6526250 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 6 Mar 2021 23:59:39 +0100 Subject: [PATCH 073/142] Update sonar-update-center-common to 1.26.0.846 (#625) [ci skip] --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index 7773870d..41c1f363 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,6 +1,6 @@ scalaVersion := "2.12.11" libraryDependencies ++= Seq( - "org.sonarsource.update-center" % "sonar-update-center-common" % "1.25.0.830", + "org.sonarsource.update-center" % "sonar-update-center-common" % "1.26.0.846", // Scapegoat & scalastyle inspections generator dependencies "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.6", "com.beautiful-scala" %% "scalastyle" % "1.5.0", From 398ad017fcd79fd5448cc0bd0b2db8a7da020e31 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 6 Mar 2021 23:59:52 +0100 Subject: [PATCH 074/142] Update mockito-scala to 1.16.29 (#615) [ci skip] Co-authored-by: Michael Wizner --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 63fc1c51..74ecb8a7 100644 --- a/build.sbt +++ b/build.sbt @@ -80,7 +80,7 @@ libraryDependencies ++= List( "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5" % Test, "org.http4s" %% "http4s-blaze-server" % http4s % Test, "org.http4s" %% "http4s-dsl" % http4s % Test, - "org.mockito" %% "mockito-scala" % "1.16.3" % Test, + "org.mockito" %% "mockito-scala" % "1.16.29" % Test, "org.scalacheck" %% "scalacheck" % "1.15.3" % Test, "org.scalatest" %% "scalatest" % "3.2.3" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, From d818ddf0880dfbbb32366c80ba134b1a96264d7e Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 7 Mar 2021 00:00:21 +0100 Subject: [PATCH 075/142] Update cats-core to 2.4.2 (#606) [ci skip] --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 74ecb8a7..5f0288ee 100644 --- a/build.sbt +++ b/build.sbt @@ -72,7 +72,7 @@ libraryDependencies ++= List( "org.scalariform" %% "scalariform" % "0.2.10", "org.slf4j" % "slf4j-api" % "1.7.30" % Provided, "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, - "org.typelevel" %% "cats-core" % "2.3.1", + "org.typelevel" %% "cats-core" % "2.4.2", "org.typelevel" %% "cats-effect" % "2.3.1", "org.typelevel" %% "mouse" % "1.0.0", // TEST From 62294322f4eeb56a943bdbfc276c6aef305b61ce Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 7 Mar 2021 00:01:03 +0100 Subject: [PATCH 076/142] Update cats-effect to 2.3.3 (#608) Co-authored-by: Michael Wizner --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 5f0288ee..6f4d7500 100644 --- a/build.sbt +++ b/build.sbt @@ -73,7 +73,7 @@ libraryDependencies ++= List( "org.slf4j" % "slf4j-api" % "1.7.30" % Provided, "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, "org.typelevel" %% "cats-core" % "2.4.2", - "org.typelevel" %% "cats-effect" % "2.3.1", + "org.typelevel" %% "cats-effect" % "2.3.3", "org.typelevel" %% "mouse" % "1.0.0", // TEST "com.beachape" %% "enumeratum-scalacheck" % "1.6.1" % Test, From b46bafcf4ef7a207f6831de576efa84a826f8797 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 7 Mar 2021 00:11:05 +0100 Subject: [PATCH 077/142] Update scalatest to 3.2.5 (#611) Co-authored-by: Michael Wizner --- build.sbt | 4 ++-- examples/sbt/multi-module/build.sbt | 2 +- examples/sbt/single-module/build.sbt | 2 +- project/build.sbt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 6f4d7500..a53165f9 100644 --- a/build.sbt +++ b/build.sbt @@ -80,9 +80,9 @@ libraryDependencies ++= List( "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5" % Test, "org.http4s" %% "http4s-blaze-server" % http4s % Test, "org.http4s" %% "http4s-dsl" % http4s % Test, - "org.mockito" %% "mockito-scala" % "1.16.29" % Test, + "org.mockito" %% "mockito-scala" % "1.16.29" % Test, "org.scalacheck" %% "scalacheck" % "1.15.3" % Test, - "org.scalatest" %% "scalatest" % "3.2.3" % Test, + "org.scalatest" %% "scalatest" % "3.2.5" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test, "com.softwaremill.diffx" %% "diffx-scalatest" % "0.3.30" % Test, diff --git a/examples/sbt/multi-module/build.sbt b/examples/sbt/multi-module/build.sbt index 0a9ff906..1c0d203c 100644 --- a/examples/sbt/multi-module/build.sbt +++ b/examples/sbt/multi-module/build.sbt @@ -1,6 +1,6 @@ lazy val baseSettings = Seq( scalaVersion := "2.12.8", - libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.3" % "test", + libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.5" % "test", scapegoatVersion in ThisBuild := "1.3.9" ) diff --git a/examples/sbt/single-module/build.sbt b/examples/sbt/single-module/build.sbt index c2ec3109..424fc4ac 100644 --- a/examples/sbt/single-module/build.sbt +++ b/examples/sbt/single-module/build.sbt @@ -1,4 +1,4 @@ name := "sbt-single-module" scalaVersion := "2.12.8" -libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.3" % "test" +libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.5" % "test" scapegoatVersion in ThisBuild := "1.3.9" diff --git a/project/build.sbt b/project/build.sbt index 41c1f363..7d63e18c 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -5,7 +5,7 @@ libraryDependencies ++= Seq( "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.6", "com.beautiful-scala" %% "scalastyle" % "1.5.0", "org.scalameta" %% "scalameta" % "4.4.10", - "org.scalatest" %% "scalatest" % "3.2.3" % Test + "org.scalatest" %% "scalatest" % "3.2.5" % Test ) // Adding a resolver to the Artima maven repo, so sbt can download the Artima SuperSafe sbt plugin From 7c9e99b2caea743f734507a783c817fcb5b2c6bc Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 7 Mar 2021 00:24:19 +0100 Subject: [PATCH 078/142] Update scalac-scapegoat-plugin, ... to 1.4.8 (#620) [ci skip] Co-authored-by: Michael Wizner --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index 7d63e18c..34b602f2 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -2,7 +2,7 @@ scalaVersion := "2.12.11" libraryDependencies ++= Seq( "org.sonarsource.update-center" % "sonar-update-center-common" % "1.26.0.846", // Scapegoat & scalastyle inspections generator dependencies - "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.6", + "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.8", "com.beautiful-scala" %% "scalastyle" % "1.5.0", "org.scalameta" %% "scalameta" % "4.4.10", "org.scalatest" %% "scalatest" % "3.2.5" % Test From 8cb294be3c7f6782d9694f6bc27906bda95e7a84 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 13 Mar 2021 16:14:56 +0100 Subject: [PATCH 079/142] Update sbt to 1.4.9 (#628) --- examples/sbt/multi-module/project/build.properties | 2 +- examples/sbt/single-module/project/build.properties | 2 +- project/build.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sbt/multi-module/project/build.properties b/examples/sbt/multi-module/project/build.properties index 0b2e09c5..dbae93bc 100644 --- a/examples/sbt/multi-module/project/build.properties +++ b/examples/sbt/multi-module/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.7 +sbt.version=1.4.9 diff --git a/examples/sbt/single-module/project/build.properties b/examples/sbt/single-module/project/build.properties index 0b2e09c5..dbae93bc 100644 --- a/examples/sbt/single-module/project/build.properties +++ b/examples/sbt/single-module/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.7 +sbt.version=1.4.9 diff --git a/project/build.properties b/project/build.properties index 0b2e09c5..dbae93bc 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.7 +sbt.version=1.4.9 From 8e4ea208d127ca7c30fabf7fad4a2f501737fc71 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 13 Mar 2021 16:15:19 +0100 Subject: [PATCH 080/142] Update scalatest to 3.2.6 (#627) --- build.sbt | 2 +- examples/sbt/multi-module/build.sbt | 2 +- examples/sbt/single-module/build.sbt | 2 +- project/build.sbt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index a53165f9..e6c914ed 100644 --- a/build.sbt +++ b/build.sbt @@ -82,7 +82,7 @@ libraryDependencies ++= List( "org.http4s" %% "http4s-dsl" % http4s % Test, "org.mockito" %% "mockito-scala" % "1.16.29" % Test, "org.scalacheck" %% "scalacheck" % "1.15.3" % Test, - "org.scalatest" %% "scalatest" % "3.2.5" % Test, + "org.scalatest" %% "scalatest" % "3.2.6" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test, "com.softwaremill.diffx" %% "diffx-scalatest" % "0.3.30" % Test, diff --git a/examples/sbt/multi-module/build.sbt b/examples/sbt/multi-module/build.sbt index 1c0d203c..40db55e3 100644 --- a/examples/sbt/multi-module/build.sbt +++ b/examples/sbt/multi-module/build.sbt @@ -1,6 +1,6 @@ lazy val baseSettings = Seq( scalaVersion := "2.12.8", - libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.5" % "test", + libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.6" % "test", scapegoatVersion in ThisBuild := "1.3.9" ) diff --git a/examples/sbt/single-module/build.sbt b/examples/sbt/single-module/build.sbt index 424fc4ac..ef0410a6 100644 --- a/examples/sbt/single-module/build.sbt +++ b/examples/sbt/single-module/build.sbt @@ -1,4 +1,4 @@ name := "sbt-single-module" scalaVersion := "2.12.8" -libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.5" % "test" +libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.6" % "test" scapegoatVersion in ThisBuild := "1.3.9" diff --git a/project/build.sbt b/project/build.sbt index 34b602f2..3dd210db 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -5,7 +5,7 @@ libraryDependencies ++= Seq( "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.8", "com.beautiful-scala" %% "scalastyle" % "1.5.0", "org.scalameta" %% "scalameta" % "4.4.10", - "org.scalatest" %% "scalatest" % "3.2.5" % Test + "org.scalatest" %% "scalatest" % "3.2.6" % Test ) // Adding a resolver to the Artima maven repo, so sbt can download the Artima SuperSafe sbt plugin From 0168581420351ac4d5d4927deeb7d01999c3c6b1 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Tue, 30 Mar 2021 00:00:30 +0100 Subject: [PATCH 081/142] Add github test workflow (#636) --- .github/workflows/test.yml | 25 +++++++++++++++++++++++++ .gitignore | 1 + 2 files changed, 26 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 00000000..52e3abba --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,25 @@ +name: Test +on: + pull_request: +jobs: + test: + name: Test + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + - uses: olafurpg/setup-scala@v10 + with: + java-version: adopt@1.8 + - uses: actions/cache@v1 + with: + path: ~/.ivy2/cache + key: ivy-${{hashFiles('**/*.sbt')}} + restore-keys: | + ivy- + - uses: actions/cache@v1 + with: + path: ~/.sbt + key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} + restore-keys: | + sbt- + - run: sbt ';clean ;coverage ;test ;coverageReport ;scapegoat ;fixCheck ;reload plugins ;test' < /dev/null diff --git a/.gitignore b/.gitignore index c89ae649..6c3ccee6 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ metals.sbt *.log /bin/ *.orig +.DS_Store From 67d4cdc966deb0b1fcef9485382e81f7875ba1f1 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Tue, 30 Mar 2021 00:10:45 +0100 Subject: [PATCH 082/142] Update sbt-sonar (#637) --- project/plugins.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c290ab9a..1a93cf68 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,11 +1,11 @@ addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") -addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15") addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.6.1") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") -addSbtPlugin("com.github.mwz" % "sbt-sonar" % "2.2.0") +addSbtPlugin("com.sonar-scala" % "sbt-sonar" % "2.2.1") addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.12") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.26") From 303f36018dd3c2b2c3967931595cfbe1248ae1b6 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 30 Mar 2021 22:58:05 +0200 Subject: [PATCH 083/142] Update cats-effect to 2.4.1 (#639) --- build.sbt | 2 +- src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala | 2 +- src/main/scala/com/mwz/sonar/scala/Metadata.scala | 2 +- src/main/scala/com/mwz/sonar/scala/ScalaPlugin.scala | 2 +- src/main/scala/com/mwz/sonar/scala/junit/JUnitReport.scala | 2 +- .../scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala | 2 +- src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala | 2 +- src/main/scala/com/mwz/sonar/scala/metadata/model.scala | 2 +- .../mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala | 2 +- .../scala/metadata/scalastyle/ScalastyleRulesRepository.scala | 2 +- .../com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRules.scala | 2 +- .../scala/metadata/scapegoat/ScapegoatRulesRepository.scala | 2 +- src/main/scala/com/mwz/sonar/scala/package.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/GlobalIssues.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/github/Codec.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/github/Github.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/github/entities.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/model.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/package.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/patch.scala | 2 +- .../scala/com/mwz/sonar/scala/qualityprofiles/Overrides.scala | 2 +- .../sonar/scala/qualityprofiles/RecommendedQualityProfile.scala | 2 +- .../qualityprofiles/ScalastyleScapegoatQualityProfile.scala | 2 +- .../com/mwz/sonar/scala/scalastyle/ScalastyleChecker.scala | 2 +- .../mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala | 2 +- .../mwz/sonar/scala/scalastyle/ScalastyleRulesRepository.scala | 2 +- .../scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala | 2 +- .../scala/com/mwz/sonar/scala/scapegoat/ScapegoatIssue.scala | 2 +- .../com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfile.scala | 2 +- .../com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala | 2 +- .../mwz/sonar/scala/scapegoat/ScapegoatRulesRepository.scala | 2 +- .../scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala | 2 +- .../scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala | 2 +- .../scala/com/mwz/sonar/scala/scoverage/ScoverageMetrics.scala | 2 +- .../com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala | 2 +- .../scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala | 2 +- src/main/scala/com/mwz/sonar/scala/scoverage/package.scala | 2 +- src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala | 2 +- src/main/scala/com/mwz/sonar/scala/sensor/ScalaSensor.scala | 2 +- src/main/scala/com/mwz/sonar/scala/util/Log.scala | 2 +- src/main/scala/com/mwz/sonar/scala/util/Logger.scala | 2 +- src/main/scala/com/mwz/sonar/scala/util/PathUtils.scala | 2 +- src/main/scala/com/mwz/sonar/scala/util/syntax/Optionals.scala | 2 +- .../scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala | 2 +- .../scala/com/mwz/sonar/scala/util/syntax/SonarFileSystem.scala | 2 +- .../com/mwz/sonar/scala/util/syntax/SonarSensorContext.scala | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/build.sbt b/build.sbt index e6c914ed..04733ca0 100644 --- a/build.sbt +++ b/build.sbt @@ -73,7 +73,7 @@ libraryDependencies ++= List( "org.slf4j" % "slf4j-api" % "1.7.30" % Provided, "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, "org.typelevel" %% "cats-core" % "2.4.2", - "org.typelevel" %% "cats-effect" % "2.3.3", + "org.typelevel" %% "cats-effect" % "2.4.1", "org.typelevel" %% "mouse" % "1.0.0", // TEST "com.beachape" %% "enumeratum-scalacheck" % "1.6.1" % Test, diff --git a/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala b/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala index 3d797ac3..e122024f 100644 --- a/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala +++ b/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/Metadata.scala b/src/main/scala/com/mwz/sonar/scala/Metadata.scala index 0352f5ed..f08566da 100644 --- a/src/main/scala/com/mwz/sonar/scala/Metadata.scala +++ b/src/main/scala/com/mwz/sonar/scala/Metadata.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/ScalaPlugin.scala b/src/main/scala/com/mwz/sonar/scala/ScalaPlugin.scala index 04bde37b..2bb1409b 100644 --- a/src/main/scala/com/mwz/sonar/scala/ScalaPlugin.scala +++ b/src/main/scala/com/mwz/sonar/scala/ScalaPlugin.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/junit/JUnitReport.scala b/src/main/scala/com/mwz/sonar/scala/junit/JUnitReport.scala index efeee1d1..07b08d34 100644 --- a/src/main/scala/com/mwz/sonar/scala/junit/JUnitReport.scala +++ b/src/main/scala/com/mwz/sonar/scala/junit/JUnitReport.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala b/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala index 4bc68bc5..1de389eb 100644 --- a/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala +++ b/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala b/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala index 7a0a312f..faef347a 100644 --- a/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/metadata/model.scala b/src/main/scala/com/mwz/sonar/scala/metadata/model.scala index 82d27708..7b019abe 100644 --- a/src/main/scala/com/mwz/sonar/scala/metadata/model.scala +++ b/src/main/scala/com/mwz/sonar/scala/metadata/model.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala b/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala index 84d33628..579ebc67 100644 --- a/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala +++ b/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesRepository.scala b/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesRepository.scala index cad0fb24..7e5cc17c 100644 --- a/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesRepository.scala +++ b/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesRepository.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRules.scala b/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRules.scala index 46ef076f..3a4cf288 100644 --- a/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRules.scala +++ b/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRules.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesRepository.scala b/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesRepository.scala index 363647cd..deb69851 100644 --- a/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesRepository.scala +++ b/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesRepository.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/package.scala b/src/main/scala/com/mwz/sonar/scala/package.scala index 9b871fcd..5049406f 100644 --- a/src/main/scala/com/mwz/sonar/scala/package.scala +++ b/src/main/scala/com/mwz/sonar/scala/package.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala b/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala index 6209a3e4..8b2af5f0 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/GlobalIssues.scala b/src/main/scala/com/mwz/sonar/scala/pr/GlobalIssues.scala index 7c523271..0473f882 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/GlobalIssues.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/GlobalIssues.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/github/Codec.scala b/src/main/scala/com/mwz/sonar/scala/pr/github/Codec.scala index ff7b93f3..a882b56e 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/github/Codec.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/github/Codec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/github/Github.scala b/src/main/scala/com/mwz/sonar/scala/pr/github/Github.scala index d60c3f6e..b9efab7d 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/github/Github.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/github/Github.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/github/entities.scala b/src/main/scala/com/mwz/sonar/scala/pr/github/entities.scala index 6ccb02c4..fb803ffb 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/github/entities.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/github/entities.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/model.scala b/src/main/scala/com/mwz/sonar/scala/pr/model.scala index 1a0bdfac..b93100dd 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/model.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/model.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/package.scala b/src/main/scala/com/mwz/sonar/scala/pr/package.scala index 63e0be67..8b1426ce 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/package.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/package.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/patch.scala b/src/main/scala/com/mwz/sonar/scala/pr/patch.scala index 03a7056b..1b52a72f 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/patch.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/patch.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/qualityprofiles/Overrides.scala b/src/main/scala/com/mwz/sonar/scala/qualityprofiles/Overrides.scala index 6c55a8dc..6144ecb3 100644 --- a/src/main/scala/com/mwz/sonar/scala/qualityprofiles/Overrides.scala +++ b/src/main/scala/com/mwz/sonar/scala/qualityprofiles/Overrides.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfile.scala b/src/main/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfile.scala index e166ef71..cb79172a 100644 --- a/src/main/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfile.scala +++ b/src/main/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfile.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfile.scala b/src/main/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfile.scala index 88e5825b..6668e258 100644 --- a/src/main/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfile.scala +++ b/src/main/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfile.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleChecker.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleChecker.scala index 81213f29..4cb83a5f 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleChecker.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleChecker.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala index 0a7479e0..a9fe9385 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepository.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepository.scala index 3002dfff..fc3d5538 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepository.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepository.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala index 59d3a5a3..9f7c5dc6 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatIssue.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatIssue.scala index 9904805d..7b47f3ec 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatIssue.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatIssue.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfile.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfile.scala index da630fcb..b1808329 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfile.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfile.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala index 759e07a5..88ad41f0 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepository.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepository.scala index c9ed729d..d30fe66e 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepository.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepository.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala index 8ffd884b..7398158d 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala index ed05475a..39871bfe 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMetrics.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMetrics.scala index 758de130..0bbe54da 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMetrics.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMetrics.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala index efec2649..34843db0 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala index 0d0d80e7..a30ede9d 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/package.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/package.scala index 6aea752e..b3434d64 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/package.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/package.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala b/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala index 64d1d589..8c46d572 100644 --- a/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala +++ b/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/sensor/ScalaSensor.scala b/src/main/scala/com/mwz/sonar/scala/sensor/ScalaSensor.scala index 99713f9a..fa279f74 100644 --- a/src/main/scala/com/mwz/sonar/scala/sensor/ScalaSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/sensor/ScalaSensor.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/util/Log.scala b/src/main/scala/com/mwz/sonar/scala/util/Log.scala index 21632469..fcf5b69c 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/Log.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/Log.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/util/Logger.scala b/src/main/scala/com/mwz/sonar/scala/util/Logger.scala index aed5a899..5cef2cd1 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/Logger.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/Logger.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/util/PathUtils.scala b/src/main/scala/com/mwz/sonar/scala/util/PathUtils.scala index f05e0226..6742878a 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/PathUtils.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/PathUtils.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/util/syntax/Optionals.scala b/src/main/scala/com/mwz/sonar/scala/util/syntax/Optionals.scala index ebce320f..c64f4998 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/syntax/Optionals.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/syntax/Optionals.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala index 2ddf8032..83b62a56 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystem.scala b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystem.scala index 9cf36192..3fa3a338 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystem.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystem.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContext.scala b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContext.scala index 1a521c89..f41f5cf9 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContext.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContext.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published From 266bc96bb5cf164ac71488fb6ac5eb482a0afbe3 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 30 Mar 2021 22:59:17 +0200 Subject: [PATCH 084/142] Update sbt-scalafix to 0.9.27 (#635) Co-authored-by: Michael Wizner --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1a93cf68..828a6782 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,5 +8,5 @@ addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") addSbtPlugin("com.sonar-scala" % "sbt-sonar" % "2.2.1") addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.12") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.26") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.27") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") From 39571e9f81c60520ad5c7c217640c2b1500afeef Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 31 Mar 2021 23:59:17 +0200 Subject: [PATCH 085/142] Update cats-core to 2.5.0 (#638) Co-authored-by: Michael Wizner --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 04733ca0..60da31ef 100644 --- a/build.sbt +++ b/build.sbt @@ -72,7 +72,7 @@ libraryDependencies ++= List( "org.scalariform" %% "scalariform" % "0.2.10", "org.slf4j" % "slf4j-api" % "1.7.30" % Provided, "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, - "org.typelevel" %% "cats-core" % "2.4.2", + "org.typelevel" %% "cats-core" % "2.5.0", "org.typelevel" %% "cats-effect" % "2.4.1", "org.typelevel" %% "mouse" % "1.0.0", // TEST From cd5d9d881ad17ad35e0e455e1cbe4971f6b24423 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 31 Mar 2021 23:59:31 +0200 Subject: [PATCH 086/142] Update mockito-scala to 1.16.33 (#634) Co-authored-by: Michael Wizner --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 60da31ef..f308b5b9 100644 --- a/build.sbt +++ b/build.sbt @@ -80,7 +80,7 @@ libraryDependencies ++= List( "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5" % Test, "org.http4s" %% "http4s-blaze-server" % http4s % Test, "org.http4s" %% "http4s-dsl" % http4s % Test, - "org.mockito" %% "mockito-scala" % "1.16.29" % Test, + "org.mockito" %% "mockito-scala" % "1.16.33" % Test, "org.scalacheck" %% "scalacheck" % "1.15.3" % Test, "org.scalatest" %% "scalatest" % "3.2.6" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, From 6d6fe2d69572e4917f6da25e12084672dc4dc552 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 31 Mar 2021 23:59:44 +0200 Subject: [PATCH 087/142] Update http4s-blaze-client, ... to 0.21.21 (#633) Co-authored-by: Michael Wizner --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f308b5b9..1a4376e5 100644 --- a/build.sbt +++ b/build.sbt @@ -57,7 +57,7 @@ sourceGenerators in Compile ++= Seq( // Lib dependencies val sonarVersion = "8.5.0.37579" val circe = "0.13.0" -val http4s = "0.21.20" +val http4s = "0.21.21" libraryDependencies ++= List( "com.beachape" %% "enumeratum" % "1.6.1", "com.beachape" %% "enumeratum-cats" % "1.6.1", From cb0ff409aae32ad4d0ab350be74c6ccef1509c39 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 1 Apr 2021 00:00:24 +0200 Subject: [PATCH 088/142] Update sbt-tpolecat to 0.1.17 (#631) Co-authored-by: Michael Wizner --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 828a6782..6bb774e8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16") +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.17") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15") From 67dc4e526dec3f804d7cbf01b7fc1beb46a03c3f Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Wed, 31 Mar 2021 23:00:44 +0100 Subject: [PATCH 089/142] Bump Scala and Scapegoat versions (#629) --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 1a4376e5..0a27cf5e 100644 --- a/build.sbt +++ b/build.sbt @@ -28,7 +28,7 @@ headerLicense := Some( excludeFilter.in(headerResources) := "*.scala" // Compile options -scalaVersion := "2.13.3" +scalaVersion := "2.13.5" scalacOptions ++= Seq( "-language:reflectiveCalls", "-Ymacro-annotations", @@ -42,7 +42,7 @@ scalafmtOnCompile in ThisBuild := sys.env .get("DISABLE_SCALAFMT") .forall(_.toLowerCase == "false") -scapegoatVersion in ThisBuild := "1.4.6" +scapegoatVersion in ThisBuild := "1.4.8" scapegoatReports := Seq("xml") coverageOutputXML := true coverageOutputHTML := false From d82c539648fc8aa52ea6e6ae668d71e9109a2c5f Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Wed, 31 Mar 2021 23:01:17 +0100 Subject: [PATCH 090/142] Update SonarQube to 8.6. (#575) --- build.sbt | 2 +- src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 0a27cf5e..6d417a3e 100644 --- a/build.sbt +++ b/build.sbt @@ -55,7 +55,7 @@ sourceGenerators in Compile ++= Seq( ) // Lib dependencies -val sonarVersion = "8.5.0.37579" +val sonarVersion = "8.6.0.39681" val circe = "0.13.0" val http4s = "0.21.21" libraryDependencies ++= List( diff --git a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala index 9464aecd..8edd76e2 100755 --- a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala @@ -25,7 +25,7 @@ import org.sonar.api.{Plugin, SonarEdition, SonarQubeSide, SonarRuntime} class ScalaPluginSpec extends AnyFlatSpec with Matchers { val runtime: SonarRuntime = SonarRuntimeImpl.forSonarQube( - Version.create(8, 5), + Version.create(8, 6), SonarQubeSide.SCANNER, SonarEdition.COMMUNITY ) From 9914f9cf727c0d8dd3168e28a604f81eb02dfd9d Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 1 Apr 2021 18:01:02 +0200 Subject: [PATCH 091/142] Update scalatest to 3.2.7 (#643) --- build.sbt | 2 +- examples/sbt/multi-module/build.sbt | 2 +- examples/sbt/single-module/build.sbt | 2 +- project/build.sbt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 6d417a3e..e5fd21e8 100644 --- a/build.sbt +++ b/build.sbt @@ -82,7 +82,7 @@ libraryDependencies ++= List( "org.http4s" %% "http4s-dsl" % http4s % Test, "org.mockito" %% "mockito-scala" % "1.16.33" % Test, "org.scalacheck" %% "scalacheck" % "1.15.3" % Test, - "org.scalatest" %% "scalatest" % "3.2.6" % Test, + "org.scalatest" %% "scalatest" % "3.2.7" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test, "com.softwaremill.diffx" %% "diffx-scalatest" % "0.3.30" % Test, diff --git a/examples/sbt/multi-module/build.sbt b/examples/sbt/multi-module/build.sbt index 40db55e3..36b63858 100644 --- a/examples/sbt/multi-module/build.sbt +++ b/examples/sbt/multi-module/build.sbt @@ -1,6 +1,6 @@ lazy val baseSettings = Seq( scalaVersion := "2.12.8", - libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.6" % "test", + libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.7" % "test", scapegoatVersion in ThisBuild := "1.3.9" ) diff --git a/examples/sbt/single-module/build.sbt b/examples/sbt/single-module/build.sbt index ef0410a6..d46c098a 100644 --- a/examples/sbt/single-module/build.sbt +++ b/examples/sbt/single-module/build.sbt @@ -1,4 +1,4 @@ name := "sbt-single-module" scalaVersion := "2.12.8" -libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.6" % "test" +libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.7" % "test" scapegoatVersion in ThisBuild := "1.3.9" diff --git a/project/build.sbt b/project/build.sbt index 3dd210db..cad62f71 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -5,7 +5,7 @@ libraryDependencies ++= Seq( "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.8", "com.beautiful-scala" %% "scalastyle" % "1.5.0", "org.scalameta" %% "scalameta" % "4.4.10", - "org.scalatest" %% "scalatest" % "3.2.6" % Test + "org.scalatest" %% "scalatest" % "3.2.7" % Test ) // Adding a resolver to the Artima maven repo, so sbt can download the Artima SuperSafe sbt plugin From d0b14335cd5800eb6bfff1df86e9ae856e55c027 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Thu, 1 Apr 2021 17:57:36 +0100 Subject: [PATCH 092/142] Update headers and reorganise imports (#644) --- .scalafix.conf | 5 ++- build.sbt | 8 ++-- .../com/mwz/sonar/scala/GlobalConfig.scala | 7 +++- .../com/mwz/sonar/scala/ScalaPlugin.scala | 6 ++- .../sonar/scala/junit/JUnitReportParser.scala | 7 +++- .../mwz/sonar/scala/junit/JUnitSensor.scala | 10 +++-- .../sonar/scala/pr/GithubPrReviewJob.scala | 11 +++-- .../com/mwz/sonar/scala/pr/GlobalIssues.scala | 3 +- .../com/mwz/sonar/scala/pr/github/Codec.scala | 3 +- .../mwz/sonar/scala/pr/github/Github.scala | 6 ++- .../scala/scalastyle/ScalastyleChecker.scala | 5 ++- .../scalastyle/ScalastyleQualityProfile.scala | 6 +-- .../ScalastyleRulesRepository.scala | 4 +- .../scala/scalastyle/ScalastyleSensor.scala | 42 ++++++++++--------- .../scapegoat/ScapegoatQualityProfile.scala | 6 +-- .../scapegoat/ScapegoatReportParser.scala | 3 +- .../scala/scapegoat/ScapegoatSensor.scala | 20 ++++++--- .../scala/scoverage/ScoverageMeasures.scala | 6 ++- .../scala/scoverage/ScoverageMetrics.scala | 4 +- .../scoverage/ScoverageReportParser.scala | 6 ++- .../scala/scoverage/ScoverageSensor.scala | 18 +++++--- .../com/mwz/sonar/scala/sensor/Measures.scala | 4 +- .../mwz/sonar/scala/sensor/ScalaSensor.scala | 4 +- .../scala/com/mwz/sonar/scala/util/Log.scala | 3 +- .../com/mwz/sonar/scala/util/Logger.scala | 3 +- .../com/mwz/sonar/scala/util/PathUtils.scala | 3 +- .../sonar/scala/util/syntax/SonarConfig.scala | 3 +- .../scala/util/syntax/SonarFileSystem.scala | 7 +++- .../com/mwz/sonar/scala/EmptyLogger.scala | 2 +- .../mwz/sonar/scala/GlobalConfigSpec.scala | 5 ++- .../com/mwz/sonar/scala/ScalaPluginSpec.scala | 7 +++- .../scala/com/mwz/sonar/scala/ScalaSpec.scala | 2 +- .../sonar/scala/SensorContextMatchers.scala | 8 ++-- .../scala/com/mwz/sonar/scala/fixtures.scala | 5 ++- .../scala/junit/JUnitReportParserSpec.scala | 5 ++- .../sonar/scala/junit/JUnitSensorSpec.scala | 14 ++++--- .../ScalastyleRulesReposotorySpec.scala | 2 +- .../scalastyle/ScalastyleRulesSpec.scala | 2 +- .../scapegoat/ScapegoatRulesSpec.scala | 2 +- .../com/mwz/sonar/scala/pr/Generators.scala | 2 +- .../scala/pr/GithubPrReviewJobSpec.scala | 7 +++- .../mwz/sonar/scala/pr/GlobalIssuesSpec.scala | 2 +- .../com/mwz/sonar/scala/pr/MarkdownSpec.scala | 2 +- .../com/mwz/sonar/scala/pr/PatchSpec.scala | 2 +- .../mwz/sonar/scala/pr/ReviewStatusSpec.scala | 2 +- .../sonar/scala/pr/github/GithubSpec.scala | 2 +- .../RecommendedQualityProfileSpec.scala | 10 ++--- ...calastyleScapegoatQualityProfileSpec.scala | 8 ++-- .../scalastyle/ScalastyleCheckerSpec.scala | 6 ++- .../ScalastyleQualityProfileSpec.scala | 13 +++--- .../ScalastyleRulesRepositorySpec.scala | 12 ++++-- .../scalastyle/ScalastyleSensorSpec.scala | 28 ++++++------- .../ScapegoatQualityProfileSpec.scala | 5 ++- .../scapegoat/ScapegoatReportParserSpec.scala | 2 +- .../ScapegoatRulesRepositorySpec.scala | 8 ++-- .../scala/scapegoat/ScapegoatSensorSpec.scala | 17 +++++--- .../scapegoat/ScoverageMeasuresSpec.scala | 2 +- .../scoverage/ScoverageReportParserSpec.scala | 2 +- .../scala/scoverage/ScoverageSensorSpec.scala | 8 ++-- .../mwz/sonar/scala/sensor/MeasuresSpec.scala | 2 +- .../sonar/scala/sensor/ScalaSensorSpec.scala | 5 ++- .../com/mwz/sonar/scala/util/LogSpec.scala | 2 +- .../com/mwz/sonar/scala/util/LoggerSpec.scala | 5 ++- .../mwz/sonar/scala/util/PathUtilsSpec.scala | 2 +- .../scala/util/syntax/OptionalsSpec.scala | 5 ++- .../scala/util/syntax/SonarConfigSpec.scala | 2 +- .../util/syntax/SonarFileSystemSpec.scala | 5 ++- .../util/syntax/SonarSensorContextSpec.scala | 2 +- .../sonar/api/utils/log/SonarLogTester.scala | 5 ++- 69 files changed, 269 insertions(+), 173 deletions(-) diff --git a/.scalafix.conf b/.scalafix.conf index bb894aa4..05aaf936 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -4,7 +4,8 @@ LeakingImplicitClassVal, NoAutoTupling, NoValInForComprehension, ProcedureSyntax, -RemoveUnused +RemoveUnused, +OrganizeImports ] DisableSyntax.noVars = true @@ -16,7 +17,7 @@ DisableSyntax.noFinalize = true DisableSyntax.noValPatterns = true DisableSyntax.noUniversalEquality = true DisableSyntax.noUniversalEqualityMessage = "== and != are unsafe since they allow comparing two unrelated types" -SortImports.blocks = [ +OrganizeImports.groups = [ "java.", "scala.", "*" diff --git a/build.sbt b/build.sbt index e5fd21e8..e4488494 100644 --- a/build.sbt +++ b/build.sbt @@ -174,11 +174,9 @@ logBuffered in Test := false testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-oDTF") // scalafix -scalafixDependencies in ThisBuild += "com.nequissimus" %% "sort-imports" % "0.5.5" -addCommandAlias("fix", "all compile:scalafix test:scalafix; fixImports") -addCommandAlias("fixImports", "compile:scalafix SortImports; test:scalafix SortImports") -addCommandAlias("fixCheck", "compile:scalafix --check; test:scalafix --check; fixCheckImports") -addCommandAlias("fixCheckImports", "compile:scalafix --check SortImports; test:scalafix --check SortImports") +scalafixDependencies in ThisBuild += "com.github.liancheng" %% "organize-imports" % "0.5.0" +addCommandAlias("fix", "all compile:scalafix test:scalafix") +addCommandAlias("fixCheck", "compile:scalafix --check; test:scalafix --check") // plugins addCompilerPlugin(scalafixSemanticdb) diff --git a/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala b/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala index e122024f..57d32bc9 100644 --- a/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala +++ b/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala @@ -26,9 +26,12 @@ import cats.syntax.functor._ import com.mwz.sonar.scala.GlobalConfig._ import com.mwz.sonar.scala.util.syntax.Optionals._ import com.mwz.sonar.scala.util.syntax.SonarConfig._ -import org.http4s.{ParseFailure, ParseResult, Uri} +import org.http4s.ParseFailure +import org.http4s.ParseResult +import org.http4s.Uri import org.sonar.api.CoreProperties -import org.sonar.api.batch.{InstantiationStrategy, ScannerSide} +import org.sonar.api.batch.InstantiationStrategy +import org.sonar.api.batch.ScannerSide import org.sonar.api.config.Configuration @SuppressWarnings(Array("IncorrectlyNamedExceptions")) diff --git a/src/main/scala/com/mwz/sonar/scala/ScalaPlugin.scala b/src/main/scala/com/mwz/sonar/scala/ScalaPlugin.scala index 2bb1409b..6bf690a7 100644 --- a/src/main/scala/com/mwz/sonar/scala/ScalaPlugin.scala +++ b/src/main/scala/com/mwz/sonar/scala/ScalaPlugin.scala @@ -17,7 +17,8 @@ package com.mwz.sonar.scala -import java.nio.file.{Path, Paths} +import java.nio.file.Path +import java.nio.file.Paths import com.mwz.sonar.scala.util.Log import com.mwz.sonar.scala.util.syntax.Optionals._ @@ -25,7 +26,8 @@ import org.sonar.api.Plugin import org.sonar.api.config.Configuration import org.sonar.api.resources.AbstractLanguage import scalariform.ScalaVersion -import scalariform.lexer.{ScalaLexer, Token} +import scalariform.lexer.ScalaLexer +import scalariform.lexer.Token import scalariform.utils.Utils._ /** Defines Scala as a language for SonarQube */ diff --git a/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala b/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala index 1de389eb..e84ac5f6 100644 --- a/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala +++ b/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala @@ -23,10 +23,13 @@ import java.nio.file.Path import scala.jdk.CollectionConverters._ import scala.util.Try -import scala.xml.{Elem, XML} +import scala.xml.Elem +import scala.xml.XML import com.mwz.sonar.scala.util.Log -import org.sonar.api.batch.fs.{FilePredicate, FileSystem, InputFile} +import org.sonar.api.batch.fs.FilePredicate +import org.sonar.api.batch.fs.FileSystem +import org.sonar.api.batch.fs.InputFile import org.sonar.api.scanner.ScannerSide trait JUnitReportParserAPI { diff --git a/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala b/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala index faef347a..d9575055 100644 --- a/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala @@ -19,7 +19,8 @@ package com.mwz.sonar.scala package junit import java.io.File -import java.nio.file.{Path, Paths} +import java.nio.file.Path +import java.nio.file.Paths import scala.jdk.CollectionConverters._ @@ -27,8 +28,11 @@ import com.mwz.sonar.scala.util.Log import com.mwz.sonar.scala.util.syntax.SonarConfig._ import com.mwz.sonar.scala.util.syntax.SonarFileSystem._ import com.mwz.sonar.scala.util.syntax.SonarSensorContext._ -import org.sonar.api.batch.fs.{FileSystem, InputFile} -import org.sonar.api.batch.sensor.{Sensor, SensorContext, SensorDescriptor} +import org.sonar.api.batch.fs.FileSystem +import org.sonar.api.batch.fs.InputFile +import org.sonar.api.batch.sensor.Sensor +import org.sonar.api.batch.sensor.SensorContext +import org.sonar.api.batch.sensor.SensorDescriptor import org.sonar.api.config.Configuration import org.sonar.api.measures.CoreMetrics diff --git a/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala b/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala index 8b2af5f0..ce42bcb6 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala @@ -22,7 +22,9 @@ import scala.concurrent.ExecutionContext import cats.NonEmptyParallel import cats.data.NonEmptyList -import cats.effect.{ContextShift, IO, Sync} +import cats.effect.ContextShift +import cats.effect.IO +import cats.effect.Sync import cats.syntax.either._ import cats.syntax.eq._ import cats.syntax.flatMap._ @@ -30,13 +32,16 @@ import cats.syntax.functor._ import cats.syntax.parallel._ import cats.syntax.traverse._ import com.mwz.sonar.scala.pr.GithubPrReviewJob._ -import com.mwz.sonar.scala.pr.github.{Github, _} +import com.mwz.sonar.scala.pr.github.Github +import com.mwz.sonar.scala.pr.github._ import com.mwz.sonar.scala.util.Logger import mouse.boolean._ import org.http4s.Uri import org.http4s.client.blaze.BlazeClientBuilder import org.sonar.api.batch.fs.InputFile -import org.sonar.api.batch.postjob.{PostJob, PostJobContext, PostJobDescriptor} +import org.sonar.api.batch.postjob.PostJob +import org.sonar.api.batch.postjob.PostJobContext +import org.sonar.api.batch.postjob.PostJobDescriptor import org.sonar.api.batch.rule.Severity final class GithubPrReviewJob( diff --git a/src/main/scala/com/mwz/sonar/scala/pr/GlobalIssues.scala b/src/main/scala/com/mwz/sonar/scala/pr/GlobalIssues.scala index 0473f882..042ca8c0 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/GlobalIssues.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/GlobalIssues.scala @@ -22,9 +22,10 @@ import java.util.concurrent.ConcurrentHashMap import scala.jdk.CollectionConverters._ +import org.sonar.api.batch.InstantiationStrategy +import org.sonar.api.batch.ScannerSide import org.sonar.api.batch.fs.InputFile import org.sonar.api.batch.rule.Severity -import org.sonar.api.batch.{InstantiationStrategy, ScannerSide} import org.sonar.api.rule.RuleKey final case class Issue( diff --git a/src/main/scala/com/mwz/sonar/scala/pr/github/Codec.scala b/src/main/scala/com/mwz/sonar/scala/pr/github/Codec.scala index a882b56e..099cac62 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/github/Codec.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/github/Codec.scala @@ -20,8 +20,9 @@ package pr package github import cats.Applicative +import io.circe.Encoder +import io.circe.Printer import io.circe.generic.extras.Configuration -import io.circe.{Encoder, Printer} import org.http4s import org.http4s.EntityEncoder import org.http4s.circe.CirceEntityDecoder diff --git a/src/main/scala/com/mwz/sonar/scala/pr/github/Github.scala b/src/main/scala/com/mwz/sonar/scala/pr/github/Github.scala index b9efab7d..cbb53372 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/github/Github.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/github/Github.scala @@ -24,8 +24,12 @@ import cats.syntax.flatMap._ import com.mwz.sonar.scala.pr.github.Codec._ import io.circe.generic.auto._ import mouse.boolean._ +import org.http4s.Header +import org.http4s.Headers +import org.http4s.Method +import org.http4s.Request +import org.http4s.Uri import org.http4s.client.Client -import org.http4s.{Header, Headers, Method, Request, Uri} trait Github[F[_]] { def authenticatedUser: F[User] diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleChecker.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleChecker.scala index 4cb83a5f..8429b88c 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleChecker.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleChecker.scala @@ -18,7 +18,10 @@ package com.mwz.sonar.scala package scalastyle -import org.scalastyle.{FileSpec, Message, ScalastyleConfiguration, ScalastyleChecker => Checker} +import org.scalastyle.FileSpec +import org.scalastyle.Message +import org.scalastyle.ScalastyleConfiguration +import org.scalastyle.{ScalastyleChecker => Checker} import org.sonar.api.scanner.ScannerSide trait ScalastyleCheckerAPI { diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala index a9fe9385..efa78438 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala @@ -22,10 +22,8 @@ import com.mwz.sonar.scala.metadata.scalastyle.ScalastyleRules import com.mwz.sonar.scala.metadata.scalastyle.ScalastyleRulesRepository import com.mwz.sonar.scala.qualityprofiles.Overrides import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition -import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.{ - NewBuiltInActiveRule, - NewBuiltInQualityProfile -} +import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.NewBuiltInActiveRule +import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.NewBuiltInQualityProfile /** * Defines a Scalastyle quality profile. diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepository.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepository.scala index fc3d5538..66b78c2b 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepository.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepository.scala @@ -25,7 +25,9 @@ import com.mwz.sonar.scala.scalastyle.ScalastyleRulesRepository._ import org.sonar.api.rule.RuleStatus import org.sonar.api.rules.RuleType import org.sonar.api.server.rule.RulesDefinition -import org.sonar.api.server.rule.RulesDefinition.{NewParam, NewRepository, NewRule} +import org.sonar.api.server.rule.RulesDefinition.NewParam +import org.sonar.api.server.rule.RulesDefinition.NewRepository +import org.sonar.api.server.rule.RulesDefinition.NewRule /** * Defines a repository for the Scalastyle inspections. diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala index 9f7c5dc6..8796a432 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala @@ -27,27 +27,31 @@ import cats.syntax.eq._ import com.mwz.sonar.scala.metadata.Rule import com.mwz.sonar.scala.metadata.scalastyle.ScalastyleRules import com.mwz.sonar.scala.metadata.scalastyle.ScalastyleRulesRepository -import com.mwz.sonar.scala.pr.{GlobalIssues, Issue} +import com.mwz.sonar.scala.pr.GlobalIssues +import com.mwz.sonar.scala.pr.Issue import com.mwz.sonar.scala.util.Log import com.mwz.sonar.scala.util.syntax.Optionals._ -import org.scalastyle.{ - ConfigurationChecker, - Directory, - ErrorLevel, - FileSpec, - InfoLevel, - Level, - Message, - ScalastyleConfiguration, - StyleError, - StyleException, - WarningLevel, - ScalastyleChecker => Checker -} -import org.sonar.api.batch.fs.{FilePredicates, InputFile} -import org.sonar.api.batch.rule.{ActiveRule, Severity} -import org.sonar.api.batch.sensor.issue.{NewIssue, NewIssueLocation} -import org.sonar.api.batch.sensor.{Sensor, SensorContext, SensorDescriptor} +import org.scalastyle.ConfigurationChecker +import org.scalastyle.Directory +import org.scalastyle.ErrorLevel +import org.scalastyle.FileSpec +import org.scalastyle.InfoLevel +import org.scalastyle.Level +import org.scalastyle.Message +import org.scalastyle.ScalastyleConfiguration +import org.scalastyle.StyleError +import org.scalastyle.StyleException +import org.scalastyle.WarningLevel +import org.scalastyle.{ScalastyleChecker => Checker} +import org.sonar.api.batch.fs.FilePredicates +import org.sonar.api.batch.fs.InputFile +import org.sonar.api.batch.rule.ActiveRule +import org.sonar.api.batch.rule.Severity +import org.sonar.api.batch.sensor.Sensor +import org.sonar.api.batch.sensor.SensorContext +import org.sonar.api.batch.sensor.SensorDescriptor +import org.sonar.api.batch.sensor.issue.NewIssue +import org.sonar.api.batch.sensor.issue.NewIssueLocation import org.sonar.api.config.Configuration import org.sonar.api.rule.RuleKey diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfile.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfile.scala index b1808329..63b5608d 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfile.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfile.scala @@ -22,10 +22,8 @@ import com.mwz.sonar.scala.metadata.scapegoat.ScapegoatRules import com.mwz.sonar.scala.metadata.scapegoat.ScapegoatRulesRepository import com.mwz.sonar.scala.qualityprofiles.Overrides import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition -import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.{ - NewBuiltInActiveRule, - NewBuiltInQualityProfile -} +import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.NewBuiltInActiveRule +import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.NewBuiltInQualityProfile /** Defines a quality profile that activates all Scapegoat rules/inspections */ final class ScapegoatQualityProfile extends BuiltInQualityProfilesDefinition { diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala index 88ad41f0..06e0205e 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala @@ -18,7 +18,8 @@ package com.mwz.sonar.scala package scapegoat -import java.nio.file.{Path, Paths} +import java.nio.file.Path +import java.nio.file.Paths import scala.xml.XML diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala index 7398158d..fb160a5b 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala @@ -18,22 +18,30 @@ package com.mwz.sonar.scala package scapegoat -import java.nio.file.{Path, Paths} +import java.nio.file.Path +import java.nio.file.Paths -import scala.util.{Failure, Success, Try} +import scala.util.Failure +import scala.util.Success +import scala.util.Try import cats.syntax.eq._ import com.mwz.sonar.scala.metadata.scapegoat.ScapegoatRules import com.mwz.sonar.scala.metadata.scapegoat.ScapegoatRulesRepository -import com.mwz.sonar.scala.pr.{GlobalIssues, Issue} +import com.mwz.sonar.scala.pr.GlobalIssues +import com.mwz.sonar.scala.pr.Issue import com.mwz.sonar.scala.scapegoat.ScapegoatSensor._ import com.mwz.sonar.scala.util.Log import com.mwz.sonar.scala.util.PathUtils._ import com.mwz.sonar.scala.util.syntax.Optionals._ -import org.sonar.api.batch.fs.{FileSystem, InputFile} +import org.sonar.api.batch.fs.FileSystem +import org.sonar.api.batch.fs.InputFile import org.sonar.api.batch.rule.Severity -import org.sonar.api.batch.sensor.issue.{NewIssue, NewIssueLocation} -import org.sonar.api.batch.sensor.{Sensor, SensorContext, SensorDescriptor} +import org.sonar.api.batch.sensor.Sensor +import org.sonar.api.batch.sensor.SensorContext +import org.sonar.api.batch.sensor.SensorDescriptor +import org.sonar.api.batch.sensor.issue.NewIssue +import org.sonar.api.batch.sensor.issue.NewIssueLocation import org.sonar.api.config.Configuration import scalariform.ScalaVersion diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala index 39871bfe..382405df 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala @@ -20,7 +20,6 @@ package scoverage import scala.jdk.CollectionConverters._ -import ScoverageMeasures._ import cats.data.Chain import cats.data.Chain._ import cats.syntax.bitraverse._ @@ -29,7 +28,10 @@ import cats.syntax.foldable._ import org.sonar.api.ce.measure.Component import org.sonar.api.ce.measure.MeasureComputer import org.sonar.api.ce.measure.MeasureComputer.MeasureComputerContext -import org.sonar.api.ce.measure.MeasureComputer.{MeasureComputerDefinition, MeasureComputerDefinitionContext} +import org.sonar.api.ce.measure.MeasureComputer.MeasureComputerDefinition +import org.sonar.api.ce.measure.MeasureComputer.MeasureComputerDefinitionContext + +import ScoverageMeasures._ final class ScoverageMeasures extends MeasureComputer { override def define(context: MeasureComputerDefinitionContext): MeasureComputerDefinition = diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMetrics.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMetrics.scala index 0bbe54da..926a1d34 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMetrics.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMetrics.scala @@ -20,7 +20,9 @@ package scoverage import scala.jdk.CollectionConverters._ -import org.sonar.api.measures.{CoreMetrics, Metric, Metrics} +import org.sonar.api.measures.CoreMetrics +import org.sonar.api.measures.Metric +import org.sonar.api.measures.Metrics /** Statement coverage metric definition. */ final class ScoverageMetrics extends Metrics { diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala index 34843db0..2041930d 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala @@ -18,9 +18,11 @@ package com.mwz.sonar.scala package scoverage -import java.nio.file.{Path, Paths} +import java.nio.file.Path +import java.nio.file.Paths -import scala.xml.{Node, XML} +import scala.xml.Node +import scala.xml.XML import cats.syntax.semigroup.catsSyntaxSemigroup import com.mwz.sonar.scala.util.PathUtils diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala index a30ede9d..c7aa8c51 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala @@ -18,18 +18,26 @@ package com.mwz.sonar.scala package scoverage -import java.nio.file.{Path, Paths} +import java.nio.file.Path +import java.nio.file.Paths import scala.jdk.CollectionConverters._ -import scala.util.{Failure, Success, Try} +import scala.util.Failure +import scala.util.Success +import scala.util.Try import cats.syntax.eq._ import com.mwz.sonar.scala.scoverage.ScoverageSensor._ +import com.mwz.sonar.scala.util.Log +import com.mwz.sonar.scala.util.PathUtils import com.mwz.sonar.scala.util.PathUtils._ import com.mwz.sonar.scala.util.syntax.Optionals._ -import com.mwz.sonar.scala.util.{Log, PathUtils} -import org.sonar.api.batch.fs.{FileSystem, InputComponent, InputFile} -import org.sonar.api.batch.sensor.{Sensor, SensorContext, SensorDescriptor} +import org.sonar.api.batch.fs.FileSystem +import org.sonar.api.batch.fs.InputComponent +import org.sonar.api.batch.fs.InputFile +import org.sonar.api.batch.sensor.Sensor +import org.sonar.api.batch.sensor.SensorContext +import org.sonar.api.batch.sensor.SensorDescriptor import org.sonar.api.config.Configuration import org.sonar.api.measures.Metric import scalariform.ScalaVersion diff --git a/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala b/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala index 8c46d572..e7d9bfc4 100644 --- a/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala +++ b/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala @@ -23,7 +23,9 @@ import scala.util.matching.Regex import cats.kernel.Eq import cats.syntax.eq._ -import scalariform.lexer.{Token, TokenType, Tokens} +import scalariform.lexer.Token +import scalariform.lexer.TokenType +import scalariform.lexer.Tokens /** Scala Sensor Metrics */ object Measures { diff --git a/src/main/scala/com/mwz/sonar/scala/sensor/ScalaSensor.scala b/src/main/scala/com/mwz/sonar/scala/sensor/ScalaSensor.scala index fa279f74..177ca75d 100644 --- a/src/main/scala/com/mwz/sonar/scala/sensor/ScalaSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/sensor/ScalaSensor.scala @@ -21,7 +21,9 @@ package sensor import scala.io.Source import scala.jdk.CollectionConverters._ -import org.sonar.api.batch.sensor.{Sensor, SensorContext, SensorDescriptor} +import org.sonar.api.batch.sensor.Sensor +import org.sonar.api.batch.sensor.SensorContext +import org.sonar.api.batch.sensor.SensorDescriptor import org.sonar.api.measures.{CoreMetrics => CM} import scalariform.ScalaVersion diff --git a/src/main/scala/com/mwz/sonar/scala/util/Log.scala b/src/main/scala/com/mwz/sonar/scala/util/Log.scala index fcf5b69c..9c7d02cc 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/Log.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/Log.scala @@ -18,7 +18,8 @@ package com.mwz.sonar.scala package util -import org.sonar.api.utils.log.{Logger => SonarLogger, Loggers => SonarLoggers} +import org.sonar.api.utils.log.{Logger => SonarLogger} +import org.sonar.api.utils.log.{Loggers => SonarLoggers} trait Log { def debug(s: String): Unit diff --git a/src/main/scala/com/mwz/sonar/scala/util/Logger.scala b/src/main/scala/com/mwz/sonar/scala/util/Logger.scala index 5cef2cd1..3439eb1d 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/Logger.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/Logger.scala @@ -19,7 +19,8 @@ package com.mwz.sonar.scala package util import cats.effect.Sync -import org.sonar.api.utils.log.{Logger => SonarLogger, Loggers => SonarLoggers} +import org.sonar.api.utils.log.{Logger => SonarLogger} +import org.sonar.api.utils.log.{Loggers => SonarLoggers} trait Logger[F[_]] { def debug(s: String): F[Unit] diff --git a/src/main/scala/com/mwz/sonar/scala/util/PathUtils.scala b/src/main/scala/com/mwz/sonar/scala/util/PathUtils.scala index 6742878a..fd4fad05 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/PathUtils.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/PathUtils.scala @@ -18,7 +18,8 @@ package com.mwz.sonar.scala package util -import java.nio.file.{Path, Paths} +import java.nio.file.Path +import java.nio.file.Paths import org.sonar.api.batch.fs.FileSystem diff --git a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala index 83b62a56..bb882c44 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala @@ -19,7 +19,8 @@ package com.mwz.sonar.scala package util package syntax -import java.nio.file.{Path, Paths} +import java.nio.file.Path +import java.nio.file.Paths import cats.syntax.eq._ import com.mwz.sonar.scala.util.syntax.Optionals._ diff --git a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystem.scala b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystem.scala index 3fa3a338..da1b7c46 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystem.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystem.scala @@ -22,10 +22,13 @@ package syntax import java.io.File import java.nio.file.Path -import scala.util.{Failure, Success, Try} +import scala.util.Failure +import scala.util.Success +import scala.util.Try +import cats.Monad +import cats.MonoidK import cats.syntax.flatMap._ -import cats.{Monad, MonoidK} import org.sonar.api.batch.fs.FileSystem object SonarFileSystem { diff --git a/src/test/scala/com/mwz/sonar/scala/EmptyLogger.scala b/src/test/scala/com/mwz/sonar/scala/EmptyLogger.scala index 6e0d14b4..4cc8b092 100644 --- a/src/test/scala/com/mwz/sonar/scala/EmptyLogger.scala +++ b/src/test/scala/com/mwz/sonar/scala/EmptyLogger.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/GlobalConfigSpec.scala b/src/test/scala/com/mwz/sonar/scala/GlobalConfigSpec.scala index 6b2c8e10..01b77ae8 100644 --- a/src/test/scala/com/mwz/sonar/scala/GlobalConfigSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/GlobalConfigSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -17,9 +17,10 @@ package com.mwz.sonar.scala +import org.scalatest.EitherValues +import org.scalatest.OptionValues import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import org.scalatest.{EitherValues, OptionValues} import org.sonar.api.config.internal.MapSettings class GlobalConfigSpec extends AnyFlatSpec with Matchers with OptionValues with EitherValues { diff --git a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala index 8edd76e2..45d6d8f6 100755 --- a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -19,9 +19,12 @@ package com.mwz.sonar.scala import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers +import org.sonar.api.Plugin +import org.sonar.api.SonarEdition +import org.sonar.api.SonarQubeSide +import org.sonar.api.SonarRuntime import org.sonar.api.internal.SonarRuntimeImpl import org.sonar.api.utils.Version -import org.sonar.api.{Plugin, SonarEdition, SonarQubeSide, SonarRuntime} class ScalaPluginSpec extends AnyFlatSpec with Matchers { val runtime: SonarRuntime = SonarRuntimeImpl.forSonarQube( diff --git a/src/test/scala/com/mwz/sonar/scala/ScalaSpec.scala b/src/test/scala/com/mwz/sonar/scala/ScalaSpec.scala index 08bff991..5c065e3c 100644 --- a/src/test/scala/com/mwz/sonar/scala/ScalaSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/ScalaSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/SensorContextMatchers.scala b/src/test/scala/com/mwz/sonar/scala/SensorContextMatchers.scala index f5ea6d52..8384c85b 100644 --- a/src/test/scala/com/mwz/sonar/scala/SensorContextMatchers.scala +++ b/src/test/scala/com/mwz/sonar/scala/SensorContextMatchers.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -18,10 +18,12 @@ package com.mwz.sonar.scala import org.scalactic.Equality +import org.scalatest.matchers.HavePropertyMatchResult +import org.scalatest.matchers.HavePropertyMatcher import org.scalatest.matchers.should.Matchers -import org.scalatest.matchers.{HavePropertyMatchResult, HavePropertyMatcher} import org.sonar.api.batch.sensor.internal.SensorContextTester -import org.sonar.api.batch.sensor.issue.{Issue, IssueLocation} +import org.sonar.api.batch.sensor.issue.Issue +import org.sonar.api.batch.sensor.issue.IssueLocation /** Custom matchers to test properties of sensor contexts */ trait SensorContextMatchers extends Matchers { diff --git a/src/test/scala/com/mwz/sonar/scala/fixtures.scala b/src/test/scala/com/mwz/sonar/scala/fixtures.scala index 82b2b473..6880d0b1 100644 --- a/src/test/scala/com/mwz/sonar/scala/fixtures.scala +++ b/src/test/scala/com/mwz/sonar/scala/fixtures.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -18,7 +18,8 @@ package com.mwz.sonar.scala import java.io.File -import java.nio.file.{Files, Path} +import java.nio.file.Files +import java.nio.file.Path import cats.effect.IO import cats.effect.concurrent.Ref diff --git a/src/test/scala/com/mwz/sonar/scala/junit/JUnitReportParserSpec.scala b/src/test/scala/com/mwz/sonar/scala/junit/JUnitReportParserSpec.scala index 55a0488c..0d8931c0 100644 --- a/src/test/scala/com/mwz/sonar/scala/junit/JUnitReportParserSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/junit/JUnitReportParserSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -26,7 +26,8 @@ import org.scalatest.LoneElement import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import org.sonar.api.batch.fs.InputFile -import org.sonar.api.batch.fs.internal.{DefaultFileSystem, TestInputFileBuilder} +import org.sonar.api.batch.fs.internal.DefaultFileSystem +import org.sonar.api.batch.fs.internal.TestInputFileBuilder class JUnitReportParserSpec extends AnyFlatSpec with Matchers with WithFiles with LoneElement { it should "get report files" in { diff --git a/src/test/scala/com/mwz/sonar/scala/junit/JUnitSensorSpec.scala b/src/test/scala/com/mwz/sonar/scala/junit/JUnitSensorSpec.scala index 44b24a45..d7c0b97d 100644 --- a/src/test/scala/com/mwz/sonar/scala/junit/JUnitSensorSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/junit/JUnitSensorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -19,15 +19,19 @@ package com.mwz.sonar.scala package junit import java.io.File -import java.nio.file.{Path, Paths} +import java.nio.file.Path +import java.nio.file.Paths -import org.mockito.{ArgumentMatchersSugar, MockitoSugar} +import org.mockito.ArgumentMatchersSugar +import org.mockito.MockitoSugar import org.scalatest.LoneElement import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import org.sonar.api.batch.fs.InputFile -import org.sonar.api.batch.fs.internal.{DefaultFileSystem, TestInputFileBuilder} -import org.sonar.api.batch.sensor.internal.{DefaultSensorDescriptor, SensorContextTester} +import org.sonar.api.batch.fs.internal.DefaultFileSystem +import org.sonar.api.batch.fs.internal.TestInputFileBuilder +import org.sonar.api.batch.sensor.internal.DefaultSensorDescriptor +import org.sonar.api.batch.sensor.internal.SensorContextTester import org.sonar.api.config.internal.MapSettings class JUnitSensorSpec diff --git a/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesReposotorySpec.scala b/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesReposotorySpec.scala index 86c0c0fb..112a96c6 100644 --- a/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesReposotorySpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesReposotorySpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesSpec.scala b/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesSpec.scala index 12a16397..335e72ec 100644 --- a/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesSpec.scala b/src/test/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesSpec.scala index 3b5d19d4..c9058be7 100644 --- a/src/test/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/pr/Generators.scala b/src/test/scala/com/mwz/sonar/scala/pr/Generators.scala index 69f00b6b..218b3a0a 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/Generators.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/Generators.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/pr/GithubPrReviewJobSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/GithubPrReviewJobSpec.scala index 602f7acf..22076f6e 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/GithubPrReviewJobSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/GithubPrReviewJobSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -28,10 +28,13 @@ import com.mwz.sonar.scala.GlobalConfig import com.mwz.sonar.scala.WithLogging import com.mwz.sonar.scala.WithTracing import com.mwz.sonar.scala.pr.Generators._ +import com.mwz.sonar.scala.pr.github.Comment import com.mwz.sonar.scala.pr.github.File import com.mwz.sonar.scala.pr.github.Github +import com.mwz.sonar.scala.pr.github.NewComment +import com.mwz.sonar.scala.pr.github.NewStatus import com.mwz.sonar.scala.pr.github.PullRequest -import com.mwz.sonar.scala.pr.github.{Comment, NewComment, NewStatus, User} +import com.mwz.sonar.scala.pr.github.User import com.mwz.sonar.scala.util.Logger import org.http4s import org.http4s.Uri diff --git a/src/test/scala/com/mwz/sonar/scala/pr/GlobalIssuesSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/GlobalIssuesSpec.scala index 9ea44892..7dd5cf09 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/GlobalIssuesSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/GlobalIssuesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/pr/MarkdownSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/MarkdownSpec.scala index 04ad66d9..d2a073c6 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/MarkdownSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/MarkdownSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/pr/PatchSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/PatchSpec.scala index 754aa544..60fac960 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/PatchSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/PatchSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/pr/ReviewStatusSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/ReviewStatusSpec.scala index 892963e7..f4b3dad2 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/ReviewStatusSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/ReviewStatusSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala index 033c1ebf..0172cb58 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfileSpec.scala b/src/test/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfileSpec.scala index eaf0b7dc..bdea2de3 100644 --- a/src/test/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfileSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfileSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -23,11 +23,9 @@ import scala.jdk.CollectionConverters._ import org.scalatest._ import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.{ - BuiltInActiveRule, - BuiltInQualityProfile, - Context -} +import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.BuiltInActiveRule +import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.BuiltInQualityProfile +import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.Context class RecommendedQualityProfileSpec extends AnyFlatSpec diff --git a/src/test/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfileSpec.scala b/src/test/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfileSpec.scala index 86147830..09999dd4 100644 --- a/src/test/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfileSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfileSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -17,10 +17,12 @@ package com.mwz.sonar.scala.qualityprofiles +import org.scalatest.Inspectors +import org.scalatest.LoneElement import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import org.scalatest.{Inspectors, LoneElement} -import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.{BuiltInQualityProfile, Context} +import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.BuiltInQualityProfile +import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.Context /** Tests the correct behavior of the Scalastyle+Scapegoat Quality Profile */ class ScalastyleScapegoatQualityProfileSpec diff --git a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleCheckerSpec.scala b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleCheckerSpec.scala index a7fa46af..a084365f 100644 --- a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleCheckerSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleCheckerSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -20,7 +20,9 @@ package scalastyle import org.mockito.ArgumentMatchers._ import org.mockito.Mockito._ -import org.scalastyle.{FileSpec, ScalastyleConfiguration, ScalastyleChecker => Checker} +import org.scalastyle.FileSpec +import org.scalastyle.ScalastyleConfiguration +import org.scalastyle.{ScalastyleChecker => Checker} import org.scalatest.flatspec.AnyFlatSpec import org.scalatestplus.mockito.MockitoSugar diff --git a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfileSpec.scala b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfileSpec.scala index b2ca98bf..22421582 100644 --- a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfileSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfileSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -22,14 +22,13 @@ import scala.jdk.CollectionConverters._ import com.mwz.sonar.scala.metadata.scalastyle.ScalastyleRules import com.mwz.sonar.scala.metadata.scalastyle.ScalastyleRulesRepository.SkipTemplateInstances +import org.scalatest.Inspectors +import org.scalatest.LoneElement import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import org.scalatest.{Inspectors, LoneElement} -import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.{ - BuiltInActiveRule, - BuiltInQualityProfile, - Context -} +import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.BuiltInActiveRule +import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.BuiltInQualityProfile +import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.Context class ScalastyleQualityProfileSpec extends AnyFlatSpec with Matchers with LoneElement with Inspectors { trait Ctx { diff --git a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepositorySpec.scala b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepositorySpec.scala index 7765dd00..d721d2c6 100644 --- a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepositorySpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepositorySpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -21,13 +21,17 @@ package scalastyle import scala.jdk.CollectionConverters._ import com.mwz.sonar.scala.metadata.scalastyle.ScalastyleRules +import org.scalatest.Inspectors +import org.scalatest.LoneElement import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import org.scalatest.{Inspectors, LoneElement} import org.sonar.api.rule.RuleStatus import org.sonar.api.rules.RuleType -import org.sonar.api.server.rule.RulesDefinition.{Context, Repository, Rule} -import org.sonar.api.server.rule.{RuleParamType, RulesDefinition} +import org.sonar.api.server.rule.RuleParamType +import org.sonar.api.server.rule.RulesDefinition +import org.sonar.api.server.rule.RulesDefinition.Context +import org.sonar.api.server.rule.RulesDefinition.Repository +import org.sonar.api.server.rule.RulesDefinition.Rule class ScalastyleRulesRepositorySpec extends AnyFlatSpec with Matchers with Inspectors with LoneElement { trait Ctx { diff --git a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensorSpec.scala b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensorSpec.scala index 3f2bfdb8..20b67b93 100644 --- a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensorSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -25,18 +25,16 @@ import scala.jdk.CollectionConverters._ import com.mwz.sonar.scala.pr.GlobalIssues import com.mwz.sonar.scala.pr.Issue import com.mwz.sonar.scala.util.PathUtils.cwd +import org.scalastyle.ConfigurationChecker +import org.scalastyle.ErrorLevel +import org.scalastyle.FileSpec +import org.scalastyle.InfoLevel +import org.scalastyle.Message +import org.scalastyle.ScalastyleConfiguration +import org.scalastyle.StyleError +import org.scalastyle.WarningLevel import org.scalastyle.scalariform.EmptyClassChecker -import org.scalastyle.{ - ConfigurationChecker, - ErrorLevel, - FileSpec, - InfoLevel, - Message, - ScalastyleConfiguration, - StyleError, - WarningLevel, - ScalastyleChecker => Checker -} +import org.scalastyle.{ScalastyleChecker => Checker} import org.scalatest._ import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers @@ -44,8 +42,10 @@ import org.scalatestplus.mockito.MockitoSugar import org.sonar.api.batch.fs.InputFile import org.sonar.api.batch.fs.internal.TestInputFileBuilder import org.sonar.api.batch.rule.Severity -import org.sonar.api.batch.rule.internal.{ActiveRulesBuilder, NewActiveRule} -import org.sonar.api.batch.sensor.internal.{DefaultSensorDescriptor, SensorContextTester} +import org.sonar.api.batch.rule.internal.ActiveRulesBuilder +import org.sonar.api.batch.rule.internal.NewActiveRule +import org.sonar.api.batch.sensor.internal.DefaultSensorDescriptor +import org.sonar.api.batch.sensor.internal.SensorContextTester import org.sonar.api.config.internal.MapSettings import org.sonar.api.rule.RuleKey diff --git a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfileSpec.scala b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfileSpec.scala index 098e90ab..b6f896d6 100644 --- a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfileSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfileSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -18,9 +18,10 @@ package com.mwz.sonar.scala.scapegoat import com.mwz.sonar.scala.metadata.scapegoat.ScapegoatRules +import org.scalatest.Inspectors +import org.scalatest.LoneElement import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import org.scalatest.{Inspectors, LoneElement} import org.sonar.api.server.profile.BuiltInQualityProfilesDefinition.Context /** Tests the correct behavior of the Scapegoat Quality Profile */ diff --git a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParserSpec.scala b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParserSpec.scala index 1a171c54..85c4413d 100644 --- a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParserSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParserSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepositorySpec.scala b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepositorySpec.scala index cc835f33..cc159afc 100644 --- a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepositorySpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepositorySpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -18,10 +18,12 @@ package com.mwz.sonar.scala.scapegoat import com.mwz.sonar.scala.metadata.scapegoat.ScapegoatRules +import org.scalatest.Inspectors +import org.scalatest.LoneElement import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import org.scalatest.{Inspectors, LoneElement} -import org.sonar.api.rule.{RuleStatus, Severity} +import org.sonar.api.rule.RuleStatus +import org.sonar.api.rule.Severity import org.sonar.api.rules.RuleType import org.sonar.api.server.rule.RulesDefinition.Context diff --git a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensorSpec.scala b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensorSpec.scala index 2d213f58..c8579b9a 100644 --- a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensorSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -18,7 +18,8 @@ package com.mwz.sonar.scala package scapegoat -import java.nio.file.{Path, Paths} +import java.nio.file.Path +import java.nio.file.Paths import scala.jdk.CollectionConverters._ @@ -27,14 +28,18 @@ import com.mwz.sonar.scala.pr.Issue import com.mwz.sonar.scala.util.PathUtils.cwd import org.mockito.ArgumentMatchers._ import org.mockito.Mockito._ +import org.scalatest.LoneElement +import org.scalatest.OptionValues import org.scalatest.flatspec.AnyFlatSpec -import org.scalatest.{LoneElement, OptionValues} import org.scalatestplus.mockito.MockitoSugar import org.sonar.api.batch.fs.InputFile -import org.sonar.api.batch.fs.internal.{DefaultFileSystem, TestInputFileBuilder} +import org.sonar.api.batch.fs.internal.DefaultFileSystem +import org.sonar.api.batch.fs.internal.TestInputFileBuilder import org.sonar.api.batch.rule.Severity -import org.sonar.api.batch.rule.internal.{ActiveRulesBuilder, NewActiveRule} -import org.sonar.api.batch.sensor.internal.{DefaultSensorDescriptor, SensorContextTester} +import org.sonar.api.batch.rule.internal.ActiveRulesBuilder +import org.sonar.api.batch.rule.internal.NewActiveRule +import org.sonar.api.batch.sensor.internal.DefaultSensorDescriptor +import org.sonar.api.batch.sensor.internal.SensorContextTester import org.sonar.api.config.internal.MapSettings import org.sonar.api.rule.RuleKey import scalariform.ScalaVersion diff --git a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScoverageMeasuresSpec.scala b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScoverageMeasuresSpec.scala index 6b45f782..3c887d20 100644 --- a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScoverageMeasuresSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScoverageMeasuresSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParserSpec.scala b/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParserSpec.scala index 720fcde4..4afeef76 100644 --- a/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParserSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParserSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageSensorSpec.scala b/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageSensorSpec.scala index c3465d38..2baacb5a 100644 --- a/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageSensorSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageSensorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -18,14 +18,16 @@ package com.mwz.sonar.scala package scoverage -import java.nio.file.{Path, Paths} +import java.nio.file.Path +import java.nio.file.Paths import com.mwz.sonar.scala.util.PathUtils._ import org.scalatest.LoneElement import org.scalatest.flatspec.AnyFlatSpec import org.sonar.api.batch.fs.InputFile import org.sonar.api.batch.fs.internal.TestInputFileBuilder -import org.sonar.api.batch.sensor.internal.{DefaultSensorDescriptor, SensorContextTester} +import org.sonar.api.batch.sensor.internal.DefaultSensorDescriptor +import org.sonar.api.batch.sensor.internal.SensorContextTester import org.sonar.api.config.internal.MapSettings /** Tests the Scoverage Sensor */ diff --git a/src/test/scala/com/mwz/sonar/scala/sensor/MeasuresSpec.scala b/src/test/scala/com/mwz/sonar/scala/sensor/MeasuresSpec.scala index 988d6e88..244b745f 100644 --- a/src/test/scala/com/mwz/sonar/scala/sensor/MeasuresSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/sensor/MeasuresSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/sensor/ScalaSensorSpec.scala b/src/test/scala/com/mwz/sonar/scala/sensor/ScalaSensorSpec.scala index b002a17d..6007e8c3 100644 --- a/src/test/scala/com/mwz/sonar/scala/sensor/ScalaSensorSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/sensor/ScalaSensorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -23,7 +23,8 @@ import java.nio.file.Paths import org.scalatest.LoneElement import org.scalatest.flatspec.AnyFlatSpec import org.sonar.api.batch.fs.internal.TestInputFileBuilder -import org.sonar.api.batch.sensor.internal.{DefaultSensorDescriptor, SensorContextTester} +import org.sonar.api.batch.sensor.internal.DefaultSensorDescriptor +import org.sonar.api.batch.sensor.internal.SensorContextTester import org.sonar.api.config.internal.MapSettings import org.sonar.api.measures.{CoreMetrics => CM} diff --git a/src/test/scala/com/mwz/sonar/scala/util/LogSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/LogSpec.scala index b09b81b0..c6ff8208 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/LogSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/LogSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/util/LoggerSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/LoggerSpec.scala index 0c0ec343..0687955a 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/LoggerSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/LoggerSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -19,9 +19,10 @@ package com.mwz.sonar.scala.util import cats.effect.IO import com.mwz.sonar.scala.util.syntax.Optionals._ +import org.scalatest.LoneElement +import org.scalatest.OptionValues import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -import org.scalatest.{LoneElement, OptionValues} import org.sonar.api.utils.log.LoggerLevel._ import org.sonar.api.utils.log.SonarLogTester diff --git a/src/test/scala/com/mwz/sonar/scala/util/PathUtilsSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/PathUtilsSpec.scala index cdd94867..418b17c3 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/PathUtilsSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/PathUtilsSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/util/syntax/OptionalsSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/syntax/OptionalsSpec.scala index 9af79732..54d02bb9 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/syntax/OptionalsSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/syntax/OptionalsSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -21,11 +21,12 @@ package syntax import java.util.Optional -import Optionals._ import org.scalatest.OptionValues import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers +import Optionals._ + class OptionalsSpec extends AnyFlatSpec with Matchers with OptionValues { it should "convert Java Optional to Scala Option" in { Optional.of("test").toOption.value shouldBe "test" diff --git a/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarConfigSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarConfigSpec.scala index 4bd6f784..8483e1e8 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarConfigSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarConfigSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystemSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystemSpec.scala index 73a445c6..b1efef9d 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystemSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystemSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -19,7 +19,8 @@ package com.mwz.sonar.scala package util package syntax -import java.nio.file.{Path, Paths} +import java.nio.file.Path +import java.nio.file.Paths import com.mwz.sonar.scala.util.syntax.SonarFileSystem._ import org.mockito.ArgumentMatchers._ diff --git a/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContextSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContextSpec.scala index 1291956d..f3fef115 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContextSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContextSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/org/sonar/api/utils/log/SonarLogTester.scala b/src/test/scala/org/sonar/api/utils/log/SonarLogTester.scala index 8bb3b195..69cf9ec1 100644 --- a/src/test/scala/org/sonar/api/utils/log/SonarLogTester.scala +++ b/src/test/scala/org/sonar/api/utils/log/SonarLogTester.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2021 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -19,7 +19,8 @@ package org.sonar.api.utils.log import scala.jdk.CollectionConverters._ -import org.scalatest.{BeforeAndAfter, Suite} +import org.scalatest.BeforeAndAfter +import org.scalatest.Suite trait SonarLogTester extends BeforeAndAfter { this: Suite => before { From 7e556714923b64ef2012737bdd3529f0948e97eb Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Thu, 1 Apr 2021 18:21:00 +0100 Subject: [PATCH 093/142] Add sbt-ci-release (#646) --- build.sbt | 51 ++++++++++++++++++--------------------------- project/plugins.sbt | 13 ++++++------ 2 files changed, 26 insertions(+), 38 deletions(-) diff --git a/build.sbt b/build.sbt index e4488494..8c1b9dde 100644 --- a/build.sbt +++ b/build.sbt @@ -5,14 +5,12 @@ import java.time.Year import org.sonar.updatecenter.common.PluginManifest import sbt._ import sbt.librarymanagement.Resolver -import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._ -import sbtrelease.Version.Bump.Minor enablePlugins(AutomateHeaderPlugin) name := "sonar-scala" -organization := "com.github.mwz" -homepage := Some(url("https://github.com/mwz/sonar-scala")) +organization := "com.sonar-scala" +homepage := Some(url("https://github.com/sonar-scala/sonar-scala")) description := "Enables analysis of Scala projects with SonarQube." // Licence @@ -26,6 +24,21 @@ headerLicense := Some( ) ) excludeFilter.in(headerResources) := "*.scala" +scmInfo := Some( + ScmInfo( + url("https://github.com/sonar-scala/sonar-scala"), + "scm:git:https://github.com/sonar-scala/sonar-scala.git", + Some("scm:git:git@github.com:sonar-scala/sonar-scala.git") + ) +) +developers := List( + Developer( + "mwz", + "Michael Wizner", + "@mwz", + url("https://github.com/mwz") + ) +) // Compile options scalaVersion := "2.13.5" @@ -40,7 +53,7 @@ javacOptions := Seq("-Xlint:deprecation") cancelable in Global := true scalafmtOnCompile in ThisBuild := sys.env - .get("DISABLE_SCALAFMT") + .get("CI") .forall(_.toLowerCase == "false") scapegoatVersion in ThisBuild := "1.4.8" scapegoatReports := Seq("xml") @@ -91,8 +104,6 @@ libraryDependencies ++= List( // Project resolvers resolvers ++= List( - Resolver.sonatypeRepo("snapshots"), - Resolver.sonatypeRepo("releases"), "Artima Maven Repository" at "https://repo.artima.com/releases" ) @@ -136,32 +147,10 @@ artifact in (Compile, assembly) := { } addArtifact(artifact in (Compile, assembly), assembly) -// Bintray -bintrayRepository := "maven" -bintrayPackage := "sonar-scala" -bintrayVcsUrl := Some("git@github.com:mwz/sonar-scala.git") -bintrayReleaseOnPublish := true -publishMavenStyle := true -publishArtifact in Test := false +// Sonatype +sonatypeCredentialHost := "s01.oss.sonatype.org" pomIncludeRepository := (_ => false) -// Release -releaseVersionBump := Minor -releaseTagComment := s"Releasing ${(version in ThisBuild).value}. [ci skip]" -releaseCommitMessage := s"Setting version to ${(version in ThisBuild).value}. [ci skip]" -releaseProcess := Seq[ReleaseStep]( - checkSnapshotDependencies, - inquireVersions, - setReleaseVersion, - releaseStepTask(sonarScan), - commitReleaseVersion, - tagRelease, - publishArtifacts, - setNextVersion, - commitNextVersion, - pushChanges -) - // Test parallelExecution in Test := false logBuffered in Test := false diff --git a/project/plugins.sbt b/project/plugins.sbt index 6bb774e8..c7e45bc8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,12 +1,11 @@ -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.17") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.27") +addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.12") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0") -addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") -addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15") -addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.6.1") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") +addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") addSbtPlugin("com.sonar-scala" % "sbt-sonar" % "2.2.1") -addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.12") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.27") +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.17") +addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") From ceb5a559a9c07b11ec6fbc44d2bac63365a431e3 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 1 Apr 2021 19:21:21 +0200 Subject: [PATCH 094/142] Update scalameta, semanticdb-scalac to 4.4.11 (#645) --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index cad62f71..89597778 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -4,7 +4,7 @@ libraryDependencies ++= Seq( // Scapegoat & scalastyle inspections generator dependencies "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.8", "com.beautiful-scala" %% "scalastyle" % "1.5.0", - "org.scalameta" %% "scalameta" % "4.4.10", + "org.scalameta" %% "scalameta" % "4.4.11", "org.scalatest" %% "scalatest" % "3.2.7" % Test ) From 43b32f92ac46b7054a034644e985056a4e7fcead Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 3 Apr 2021 18:49:39 +0100 Subject: [PATCH 095/142] Add release workflow --- .github/workflows/release.yml | 30 ++++++++++++++++++++++++++++++ version.sbt | 1 - 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/release.yml delete mode 100644 version.sbt diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..7bbffcdc --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,30 @@ +name: Release +on: + push: + branches: [master] + tags: ["*"] +jobs: + release: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + - run: git fetch --prune --unshallow + - uses: olafurpg/setup-scala@v10 + with: + java-version: adopt@1.8 + - uses: actions/cache@v1 + with: + path: ~/.ivy2/cache + key: ivy-${{hashFiles('**/*.sbt')}} + restore-keys: ivy- + - uses: actions/cache@v1 + with: + path: ~/.sbt + key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} + restore-keys: sbt- + - run: sbt ci-release + env: + PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}} + PGP_SECRET: ${{secrets.PGP_SECRET}} + SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}} + SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}} diff --git a/version.sbt b/version.sbt deleted file mode 100644 index acca209d..00000000 --- a/version.sbt +++ /dev/null @@ -1 +0,0 @@ -version in ThisBuild := "8.7.0-SNAPSHOT" From 63f3b7edf8caaa6abe6688064b46030778c10846 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 3 Apr 2021 19:29:11 +0100 Subject: [PATCH 096/142] Add sonar-scan workflow --- .circleci/config.yml | 142 ------------------------------- .github/workflows/sonar-scan.yml | 64 ++++++++++++++ 2 files changed, 64 insertions(+), 142 deletions(-) delete mode 100644 .circleci/config.yml create mode 100644 .github/workflows/sonar-scan.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index b3e8ea5e..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,142 +0,0 @@ -version: 2 - -defaults: &defaults - docker: - - image: mwizner/sonar-scala-circleci - working_directory: ~/repo - environment: - TERM: xterm - DEBIAN_FRONTEND: noninteractive - DISABLE_SCALAFMT: true - JVM_OPTS: -Xmx3200m - SBT_OPTS: -Xmx3G -XX:MaxMetaspaceSize=1G - -jobs: - test: - <<: *defaults - steps: - - checkout - - restore_cache: - keys: - - v1-dependencies-{{ checksum "~/repo/build.sbt" }} - - v1-dependencies- - - run: - name: sbt test - command: | - sbt ';clean ;coverage ;test ;coverageReport ;scapegoat ;fixCheck ;reload plugins ;test' < /dev/null - - save_cache: - paths: - - ~/.iv2/cache - - ~/.m2 - - ~/.sbt - key: v1-dependencies-{{ checksum "~/repo/build.sbt" }} - - persist_to_workspace: - root: ~/ - paths: repo - - store_artifacts: - path: target/scala-2.12/scoverage-report/scoverage.xml - destination: scoverage.xml - - store_artifacts: - path: target/scala-2.12/scapegoat-report/scapegoat.xml - destination: scapegoat.xml - - sonar-scan: - <<: *defaults - steps: - - attach_workspace: - at: ~/ - - restore_cache: - keys: - - v1-dependencies-{{ checksum "~/repo/build.sbt" }} - - v1-dependencies- - - run: - name: sbt sonarScan - command: | - sbt -Dsonar.host.url=${SONARQUBE_URL} \ - -Dsonar.login=${SONARQUBE_ACCESS_TOKEN} \ - sonarScan < /dev/null - - sonar-scan-examples: - <<: *defaults - working_directory: ~/repo/examples - steps: - - attach_workspace: - at: ~/ - - restore_cache: - keys: - - v1-dependencies-{{ checksum "~/repo/build.sbt" }} - - v1-dependencies- - - run: - name: Set up sonar-scanner - command: echo "$SONAR_SCANNER_VERSION" > ~/sonar-scanner-version - - restore_cache: - keys: - - v1-sonar-cache-{{ checksum "~/sonar-scanner-version" }} - - v1-sonar-cache- - - run: - name: Scan example projects - working_directory: ~/repo/examples - command: ./scan.sh - - save_cache: - paths: - - ~/.iv2/cache - - ~/.m2 - - ~/.sbt - key: v1-dependencies-{{ checksum "~/repo/build.sbt" }} - - save_cache: - key: v1-sonar-cache-{{ checksum "~/sonar-scanner-version" }} - paths: ~/.sonar/cache - - release: - <<: *defaults - steps: - - attach_workspace: - at: ~/ - - restore_cache: - keys: v1-dependencies - - add_ssh_keys: - fingerprints: - - "3c:1a:75:b1:62:85:3b:1b:61:94:f8:1f:8d:0e:1d:a1" - - run: - name: Set up git - command: | - git config --global user.name "CircleCI" - git config --global user.email "mwz@users.noreply.github.com" - ssh-keyscan -T 15 github.com >> ~/.ssh/known_hosts - - run: - name: sbt release - command: | - sbt -Dsonar.host.url=${SONARQUBE_URL} \ - -Dsonar.login=${SONARQUBE_ACCESS_TOKEN} \ - 'release with-defaults skip-tests' < /dev/null - -workflows: - version: 2 - sonar-scala: - jobs: - - test - - sonar-scan-examples: - requires: - - test - filters: - branches: - only: master - - sonar-scan: - requires: - - sonar-scan-examples - filters: - branches: - only: master - - hold: - type: approval - requires: - - sonar-scan - filters: - branches: - only: master - - release: - requires: - - hold - filters: - branches: - only: master diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml new file mode 100644 index 00000000..149bc493 --- /dev/null +++ b/.github/workflows/sonar-scan.yml @@ -0,0 +1,64 @@ +name: sonar-scan +on: + push: + branches: [master] + tags: ["*"] +jobs: + test: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + - run: git fetch --prune --unshallow + - uses: olafurpg/setup-scala@v10 + with: + java-version: adopt@1.8 + - uses: actions/cache@v1 + with: + path: ~/.ivy2/cache + key: ivy-${{hashFiles('**/*.sbt')}} + restore-keys: ivy- + - uses: actions/cache@v1 + with: + path: ~/.sbt + key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} + restore-keys: sbt- + - run: sbt 'clean; coverage; test; coverageReport; scapegoat' < /dev/null + - uses: actions/upload-artifact@v2 + with: + name: scoverage + path: target/scala-2.12/scoverage-report/scoverage.xml + - uses: actions/upload-artifact@v2 + with: + name: scapegoat + path: target/scala-2.12/scapegoat-report/scapegoat.xml + sonar-scan: + runs-on: ubuntu-20.04 + needs: test + steps: + - uses: actions/checkout@v2 + - run: git fetch --prune --unshallow + - uses: olafurpg/setup-scala@v10 + with: + java-version: adopt@1.8 + - uses: actions/cache@v1 + with: + path: ~/.ivy2/cache + key: ivy-${{hashFiles('**/*.sbt')}} + restore-keys: ivy- + - uses: actions/cache@v1 + with: + path: ~/.sbt + key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} + restore-keys: sbt- + - uses: actions/download-artifact@v2 + with: + name: scapegoat + path: target/scala-2.12/scapegoat-report/scapegoat.xml + - uses: actions/download-artifact@v2 + with: + name: scoverage + path: target/scala-2.12/scoverage-report/scoverage.xml + - run: | + sbt -Dsonar.host.url=${SONARQUBE_URL} \ + -Dsonar.login=${SONARQUBE_ACCESS_TOKEN} \ + sonarScan < /dev/null From 45658bae7ec7e9076e3621a439dc33d6adf74cd4 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 3 Apr 2021 19:37:00 +0100 Subject: [PATCH 097/142] Update paths --- .github/workflows/sonar-scan.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index 149bc493..08d98a96 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -26,11 +26,11 @@ jobs: - uses: actions/upload-artifact@v2 with: name: scoverage - path: target/scala-2.12/scoverage-report/scoverage.xml + path: target/scala-2.13/scoverage-report/scoverage.xml - uses: actions/upload-artifact@v2 with: name: scapegoat - path: target/scala-2.12/scapegoat-report/scapegoat.xml + path: target/scala-2.13/scapegoat-report/scapegoat.xml sonar-scan: runs-on: ubuntu-20.04 needs: test @@ -53,11 +53,11 @@ jobs: - uses: actions/download-artifact@v2 with: name: scapegoat - path: target/scala-2.12/scapegoat-report/scapegoat.xml + path: target/scala-2.13/scapegoat-report/scapegoat.xml - uses: actions/download-artifact@v2 with: name: scoverage - path: target/scala-2.12/scoverage-report/scoverage.xml + path: target/scala-2.13/scoverage-report/scoverage.xml - run: | sbt -Dsonar.host.url=${SONARQUBE_URL} \ -Dsonar.login=${SONARQUBE_ACCESS_TOKEN} \ From 3301b120adfa5b8daac9ae8a6119729f84522e78 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 3 Apr 2021 19:43:28 +0100 Subject: [PATCH 098/142] Add env variables for scan --- .github/workflows/sonar-scan.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index 08d98a96..536ab057 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -62,3 +62,6 @@ jobs: sbt -Dsonar.host.url=${SONARQUBE_URL} \ -Dsonar.login=${SONARQUBE_ACCESS_TOKEN} \ sonarScan < /dev/null + env: + SONARQUBE_URL: ${{secrets.SONARQUBE_URL}} + SONARQUBE_ACCESS_TOKEN: ${{secrets.SONARQUBE_ACCESS_TOKEN}} From ddd19c3afa0b8db39b953c9b5049d1e2970d63e0 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 3 Apr 2021 20:57:21 +0100 Subject: [PATCH 099/142] Update paths --- .github/workflows/sonar-scan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index 536ab057..b6015b08 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -53,11 +53,11 @@ jobs: - uses: actions/download-artifact@v2 with: name: scapegoat - path: target/scala-2.13/scapegoat-report/scapegoat.xml + path: target/scala-2.13/scapegoat-report - uses: actions/download-artifact@v2 with: name: scoverage - path: target/scala-2.13/scoverage-report/scoverage.xml + path: target/scala-2.13/scoverage-report - run: | sbt -Dsonar.host.url=${SONARQUBE_URL} \ -Dsonar.login=${SONARQUBE_ACCESS_TOKEN} \ From 7d151b84cb638ee47ee055bf6b6cd90d5dc93e8c Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 3 Apr 2021 21:04:32 +0100 Subject: [PATCH 100/142] Add test report artifacts --- .github/workflows/sonar-scan.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index b6015b08..bd79f57a 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -31,6 +31,10 @@ jobs: with: name: scapegoat path: target/scala-2.13/scapegoat-report/scapegoat.xml + - uses: actions/upload-artifact@v2 + with: + name: junit + path: target/test-reports/* sonar-scan: runs-on: ubuntu-20.04 needs: test @@ -58,6 +62,10 @@ jobs: with: name: scoverage path: target/scala-2.13/scoverage-report + - uses: actions/download-artifact@v2 + with: + name: junit + path: target/test-reports - run: | sbt -Dsonar.host.url=${SONARQUBE_URL} \ -Dsonar.login=${SONARQUBE_ACCESS_TOKEN} \ From 7d9013f988048e789f97acad5d730dd765edbd18 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 3 Apr 2021 21:45:07 +0100 Subject: [PATCH 101/142] Add sonar-scan-examples job --- .github/workflows/sonar-scan.yml | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index bd79f57a..4d809217 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -3,6 +3,8 @@ on: push: branches: [master] tags: ["*"] +env: + SONAR_SCANNER_VERSION: "4.2.0.1873" jobs: test: runs-on: ubuntu-20.04 @@ -73,3 +75,37 @@ jobs: env: SONARQUBE_URL: ${{secrets.SONARQUBE_URL}} SONARQUBE_ACCESS_TOKEN: ${{secrets.SONARQUBE_ACCESS_TOKEN}} + sonar-scan-examples: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + - run: git fetch --prune --unshallow + - uses: olafurpg/setup-scala@v10 + with: + java-version: adopt@1.8 + - uses: actions/cache@v1 + with: + path: ~/.ivy2/cache + key: ivy-${{hashFiles('**/*.sbt')}} + restore-keys: ivy- + - uses: actions/cache@v1 + with: + path: ~/.sbt + key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} + restore-keys: sbt- + - run: echo "$SONAR_SCANNER_VERSION" > ~/sonar-scanner-version + - uses: actions/cache@v1 + with: + path: ~/.sonar/cache + key: sonar-scanner-${{hashFiles('~/sonar-scanner-version')}} + restore-keys: sonar-scanner- + - run: | + wget -O ~/sonar-scanner.zip \ + "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip" && \ + sudo unzip ~/sonar-scanner.zip -d /opt && \ + rm ~/sonar-scanner.zip + env: + SONAR_SCANNER_HOME: "/opt/sonar-scanner-${SONAR_SCANNER_VERSION}" + PATH: "${PATH}:${SONAR_SCANNER_HOME}/bin" + - run: sudo apt-get install -y maven gradle + - run: cd examples && ./scan.sh From 97b6b0c2280d1f7c5631187ddb63d2e5a4981c2d Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 3 Apr 2021 21:46:40 +0100 Subject: [PATCH 102/142] Install wget --- .github/workflows/sonar-scan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index 4d809217..fd7b9c4d 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -99,6 +99,7 @@ jobs: path: ~/.sonar/cache key: sonar-scanner-${{hashFiles('~/sonar-scanner-version')}} restore-keys: sonar-scanner- + - run: sudo apt-get install -y wget maven gradle - run: | wget -O ~/sonar-scanner.zip \ "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip" && \ @@ -107,5 +108,4 @@ jobs: env: SONAR_SCANNER_HOME: "/opt/sonar-scanner-${SONAR_SCANNER_VERSION}" PATH: "${PATH}:${SONAR_SCANNER_HOME}/bin" - - run: sudo apt-get install -y maven gradle - run: cd examples && ./scan.sh From d32bf87dd8d224745eed001343e58208906ea161 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 3 Apr 2021 21:56:38 +0100 Subject: [PATCH 103/142] Fix env variables --- .github/workflows/release.yml | 60 ++++++------- .github/workflows/sonar-scan.yml | 148 +++++++++++++++---------------- 2 files changed, 104 insertions(+), 104 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7bbffcdc..d31d04f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,30 +1,30 @@ -name: Release -on: - push: - branches: [master] - tags: ["*"] -jobs: - release: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - run: git fetch --prune --unshallow - - uses: olafurpg/setup-scala@v10 - with: - java-version: adopt@1.8 - - uses: actions/cache@v1 - with: - path: ~/.ivy2/cache - key: ivy-${{hashFiles('**/*.sbt')}} - restore-keys: ivy- - - uses: actions/cache@v1 - with: - path: ~/.sbt - key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} - restore-keys: sbt- - - run: sbt ci-release - env: - PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}} - PGP_SECRET: ${{secrets.PGP_SECRET}} - SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}} - SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}} +# name: Release +# on: +# push: +# branches: [master] +# tags: ["*"] +# jobs: +# release: +# runs-on: ubuntu-20.04 +# steps: +# - uses: actions/checkout@v2 +# - run: git fetch --prune --unshallow +# - uses: olafurpg/setup-scala@v10 +# with: +# java-version: adopt@1.8 +# - uses: actions/cache@v1 +# with: +# path: ~/.ivy2/cache +# key: ivy-${{hashFiles('**/*.sbt')}} +# restore-keys: ivy- +# - uses: actions/cache@v1 +# with: +# path: ~/.sbt +# key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} +# restore-keys: sbt- +# - run: sbt ci-release +# env: +# PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}} +# PGP_SECRET: ${{secrets.PGP_SECRET}} +# SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}} +# SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}} diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index fd7b9c4d..453cbcb6 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -6,75 +6,75 @@ on: env: SONAR_SCANNER_VERSION: "4.2.0.1873" jobs: - test: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - run: git fetch --prune --unshallow - - uses: olafurpg/setup-scala@v10 - with: - java-version: adopt@1.8 - - uses: actions/cache@v1 - with: - path: ~/.ivy2/cache - key: ivy-${{hashFiles('**/*.sbt')}} - restore-keys: ivy- - - uses: actions/cache@v1 - with: - path: ~/.sbt - key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} - restore-keys: sbt- - - run: sbt 'clean; coverage; test; coverageReport; scapegoat' < /dev/null - - uses: actions/upload-artifact@v2 - with: - name: scoverage - path: target/scala-2.13/scoverage-report/scoverage.xml - - uses: actions/upload-artifact@v2 - with: - name: scapegoat - path: target/scala-2.13/scapegoat-report/scapegoat.xml - - uses: actions/upload-artifact@v2 - with: - name: junit - path: target/test-reports/* - sonar-scan: - runs-on: ubuntu-20.04 - needs: test - steps: - - uses: actions/checkout@v2 - - run: git fetch --prune --unshallow - - uses: olafurpg/setup-scala@v10 - with: - java-version: adopt@1.8 - - uses: actions/cache@v1 - with: - path: ~/.ivy2/cache - key: ivy-${{hashFiles('**/*.sbt')}} - restore-keys: ivy- - - uses: actions/cache@v1 - with: - path: ~/.sbt - key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} - restore-keys: sbt- - - uses: actions/download-artifact@v2 - with: - name: scapegoat - path: target/scala-2.13/scapegoat-report - - uses: actions/download-artifact@v2 - with: - name: scoverage - path: target/scala-2.13/scoverage-report - - uses: actions/download-artifact@v2 - with: - name: junit - path: target/test-reports - - run: | - sbt -Dsonar.host.url=${SONARQUBE_URL} \ - -Dsonar.login=${SONARQUBE_ACCESS_TOKEN} \ - sonarScan < /dev/null - env: - SONARQUBE_URL: ${{secrets.SONARQUBE_URL}} - SONARQUBE_ACCESS_TOKEN: ${{secrets.SONARQUBE_ACCESS_TOKEN}} + # test: + # runs-on: ubuntu-20.04 + # steps: + # - uses: actions/checkout@v2 + # - run: git fetch --prune --unshallow + # - uses: olafurpg/setup-scala@v10 + # with: + # java-version: adopt@1.8 + # - uses: actions/cache@v1 + # with: + # path: ~/.ivy2/cache + # key: ivy-${{hashFiles('**/*.sbt')}} + # restore-keys: ivy- + # - uses: actions/cache@v1 + # with: + # path: ~/.sbt + # key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} + # restore-keys: sbt- + # - run: sbt 'clean; coverage; test; coverageReport; scapegoat' < /dev/null + # - uses: actions/upload-artifact@v2 + # with: + # name: scoverage + # path: target/scala-2.13/scoverage-report/scoverage.xml + # - uses: actions/upload-artifact@v2 + # with: + # name: scapegoat + # path: target/scala-2.13/scapegoat-report/scapegoat.xml + # - uses: actions/upload-artifact@v2 + # with: + # name: junit + # path: target/test-reports/* + # sonar-scan: + # runs-on: ubuntu-20.04 + # needs: test + # steps: + # - uses: actions/checkout@v2 + # - run: git fetch --prune --unshallow + # - uses: olafurpg/setup-scala@v10 + # with: + # java-version: adopt@1.8 + # - uses: actions/cache@v1 + # with: + # path: ~/.ivy2/cache + # key: ivy-${{hashFiles('**/*.sbt')}} + # restore-keys: ivy- + # - uses: actions/cache@v1 + # with: + # path: ~/.sbt + # key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} + # restore-keys: sbt- + # - uses: actions/download-artifact@v2 + # with: + # name: scapegoat + # path: target/scala-2.13/scapegoat-report + # - uses: actions/download-artifact@v2 + # with: + # name: scoverage + # path: target/scala-2.13/scoverage-report + # - uses: actions/download-artifact@v2 + # with: + # name: junit + # path: target/test-reports + # - run: | + # sbt -Dsonar.host.url=${SONARQUBE_URL} \ + # -Dsonar.login=${SONARQUBE_ACCESS_TOKEN} \ + # sonarScan < /dev/null + # env: + # SONARQUBE_URL: ${{secrets.SONARQUBE_URL}} + # SONARQUBE_ACCESS_TOKEN: ${{secrets.SONARQUBE_ACCESS_TOKEN}} sonar-scan-examples: runs-on: ubuntu-20.04 steps: @@ -99,13 +99,13 @@ jobs: path: ~/.sonar/cache key: sonar-scanner-${{hashFiles('~/sonar-scanner-version')}} restore-keys: sonar-scanner- - - run: sudo apt-get install -y wget maven gradle + - run: sudo apt-get update && sudo apt-get install -y wget maven gradle - run: | wget -O ~/sonar-scanner.zip \ "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip" && \ sudo unzip ~/sonar-scanner.zip -d /opt && \ rm ~/sonar-scanner.zip - env: - SONAR_SCANNER_HOME: "/opt/sonar-scanner-${SONAR_SCANNER_VERSION}" - PATH: "${PATH}:${SONAR_SCANNER_HOME}/bin" - - run: cd examples && ./scan.sh + - run: | + export SONAR_SCANNER_HOME="/opt/sonar-scanner-${SONAR_SCANNER_VERSION}" && \ + export PATH="${PATH}:${SONAR_SCANNER_HOME}/bin" && \ + cd examples && ./scan.sh From 083c6ac7f9296b56a27ec7069f1cc41af509b488 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 3 Apr 2021 21:59:01 +0100 Subject: [PATCH 104/142] Fix env variables --- .github/workflows/sonar-scan.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index 453cbcb6..a7d04ba3 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -109,3 +109,6 @@ jobs: export SONAR_SCANNER_HOME="/opt/sonar-scanner-${SONAR_SCANNER_VERSION}" && \ export PATH="${PATH}:${SONAR_SCANNER_HOME}/bin" && \ cd examples && ./scan.sh + env: + SONARQUBE_URL: ${{secrets.SONARQUBE_URL}} + SONARQUBE_ACCESS_TOKEN: ${{secrets.SONARQUBE_ACCESS_TOKEN}} From 5086c155d92a0e9d6a421f0639d8f6cdd09ba050 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 3 Apr 2021 22:36:20 +0100 Subject: [PATCH 105/142] Update gradle --- .github/workflows/sonar-scan.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index a7d04ba3..5912128c 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -99,7 +99,9 @@ jobs: path: ~/.sonar/cache key: sonar-scanner-${{hashFiles('~/sonar-scanner-version')}} restore-keys: sonar-scanner- - - run: sudo apt-get update && sudo apt-get install -y wget maven gradle + - run: | + sudo add-apt-repository ppa:cwchien/gradle && sudo apt-get update && \ + sudo apt-get install -y wget maven gradle - run: | wget -O ~/sonar-scanner.zip \ "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip" && \ From f76d22f46d85f56a252e76f13708068ac1d38097 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 3 Apr 2021 22:44:38 +0100 Subject: [PATCH 106/142] Re-enable workflows --- .github/workflows/release.yml | 60 +++++++------- .github/workflows/sonar-scan.yml | 138 +++++++++++++++---------------- 2 files changed, 99 insertions(+), 99 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d31d04f2..7bbffcdc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,30 +1,30 @@ -# name: Release -# on: -# push: -# branches: [master] -# tags: ["*"] -# jobs: -# release: -# runs-on: ubuntu-20.04 -# steps: -# - uses: actions/checkout@v2 -# - run: git fetch --prune --unshallow -# - uses: olafurpg/setup-scala@v10 -# with: -# java-version: adopt@1.8 -# - uses: actions/cache@v1 -# with: -# path: ~/.ivy2/cache -# key: ivy-${{hashFiles('**/*.sbt')}} -# restore-keys: ivy- -# - uses: actions/cache@v1 -# with: -# path: ~/.sbt -# key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} -# restore-keys: sbt- -# - run: sbt ci-release -# env: -# PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}} -# PGP_SECRET: ${{secrets.PGP_SECRET}} -# SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}} -# SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}} +name: Release +on: + push: + branches: [master] + tags: ["*"] +jobs: + release: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + - run: git fetch --prune --unshallow + - uses: olafurpg/setup-scala@v10 + with: + java-version: adopt@1.8 + - uses: actions/cache@v1 + with: + path: ~/.ivy2/cache + key: ivy-${{hashFiles('**/*.sbt')}} + restore-keys: ivy- + - uses: actions/cache@v1 + with: + path: ~/.sbt + key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} + restore-keys: sbt- + - run: sbt ci-release + env: + PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}} + PGP_SECRET: ${{secrets.PGP_SECRET}} + SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}} + SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}} diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index 5912128c..bd2eb7a2 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -6,75 +6,75 @@ on: env: SONAR_SCANNER_VERSION: "4.2.0.1873" jobs: - # test: - # runs-on: ubuntu-20.04 - # steps: - # - uses: actions/checkout@v2 - # - run: git fetch --prune --unshallow - # - uses: olafurpg/setup-scala@v10 - # with: - # java-version: adopt@1.8 - # - uses: actions/cache@v1 - # with: - # path: ~/.ivy2/cache - # key: ivy-${{hashFiles('**/*.sbt')}} - # restore-keys: ivy- - # - uses: actions/cache@v1 - # with: - # path: ~/.sbt - # key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} - # restore-keys: sbt- - # - run: sbt 'clean; coverage; test; coverageReport; scapegoat' < /dev/null - # - uses: actions/upload-artifact@v2 - # with: - # name: scoverage - # path: target/scala-2.13/scoverage-report/scoverage.xml - # - uses: actions/upload-artifact@v2 - # with: - # name: scapegoat - # path: target/scala-2.13/scapegoat-report/scapegoat.xml - # - uses: actions/upload-artifact@v2 - # with: - # name: junit - # path: target/test-reports/* - # sonar-scan: - # runs-on: ubuntu-20.04 - # needs: test - # steps: - # - uses: actions/checkout@v2 - # - run: git fetch --prune --unshallow - # - uses: olafurpg/setup-scala@v10 - # with: - # java-version: adopt@1.8 - # - uses: actions/cache@v1 - # with: - # path: ~/.ivy2/cache - # key: ivy-${{hashFiles('**/*.sbt')}} - # restore-keys: ivy- - # - uses: actions/cache@v1 - # with: - # path: ~/.sbt - # key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} - # restore-keys: sbt- - # - uses: actions/download-artifact@v2 - # with: - # name: scapegoat - # path: target/scala-2.13/scapegoat-report - # - uses: actions/download-artifact@v2 - # with: - # name: scoverage - # path: target/scala-2.13/scoverage-report - # - uses: actions/download-artifact@v2 - # with: - # name: junit - # path: target/test-reports - # - run: | - # sbt -Dsonar.host.url=${SONARQUBE_URL} \ - # -Dsonar.login=${SONARQUBE_ACCESS_TOKEN} \ - # sonarScan < /dev/null - # env: - # SONARQUBE_URL: ${{secrets.SONARQUBE_URL}} - # SONARQUBE_ACCESS_TOKEN: ${{secrets.SONARQUBE_ACCESS_TOKEN}} + test: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + - run: git fetch --prune --unshallow + - uses: olafurpg/setup-scala@v10 + with: + java-version: adopt@1.8 + - uses: actions/cache@v1 + with: + path: ~/.ivy2/cache + key: ivy-${{hashFiles('**/*.sbt')}} + restore-keys: ivy- + - uses: actions/cache@v1 + with: + path: ~/.sbt + key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} + restore-keys: sbt- + - run: sbt 'clean; coverage; test; coverageReport; scapegoat' < /dev/null + - uses: actions/upload-artifact@v2 + with: + name: scoverage + path: target/scala-2.13/scoverage-report/scoverage.xml + - uses: actions/upload-artifact@v2 + with: + name: scapegoat + path: target/scala-2.13/scapegoat-report/scapegoat.xml + - uses: actions/upload-artifact@v2 + with: + name: junit + path: target/test-reports/* + sonar-scan: + runs-on: ubuntu-20.04 + needs: test + steps: + - uses: actions/checkout@v2 + - run: git fetch --prune --unshallow + - uses: olafurpg/setup-scala@v10 + with: + java-version: adopt@1.8 + - uses: actions/cache@v1 + with: + path: ~/.ivy2/cache + key: ivy-${{hashFiles('**/*.sbt')}} + restore-keys: ivy- + - uses: actions/cache@v1 + with: + path: ~/.sbt + key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} + restore-keys: sbt- + - uses: actions/download-artifact@v2 + with: + name: scapegoat + path: target/scala-2.13/scapegoat-report + - uses: actions/download-artifact@v2 + with: + name: scoverage + path: target/scala-2.13/scoverage-report + - uses: actions/download-artifact@v2 + with: + name: junit + path: target/test-reports + - run: | + sbt -Dsonar.host.url=${SONARQUBE_URL} \ + -Dsonar.login=${SONARQUBE_ACCESS_TOKEN} \ + sonarScan < /dev/null + env: + SONARQUBE_URL: ${{secrets.SONARQUBE_URL}} + SONARQUBE_ACCESS_TOKEN: ${{secrets.SONARQUBE_ACCESS_TOKEN}} sonar-scan-examples: runs-on: ubuntu-20.04 steps: From 6d7ac693519106f561a2980c4543bf4efa016b94 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 3 Apr 2021 22:59:00 +0100 Subject: [PATCH 107/142] Update README --- README.md | 6 +++--- README.tpl.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5924488d..57a3267c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@

sonar-scala

-[![circleci-badge]][circleci] [![coverage-badge]][coverage] -[![bintray-badge]][bintray] [![bintray-badge-lts]][bintray-lts] -[![bintray-badge-lts-67]][bintray-lts-67] +![](https://img.shields.io/github/workflow/status/sonar-scala/sonar-scala/Release/master) +[![coverage-badge]][coverage] [![bintray-badge]][bintray] +[![bintray-badge-lts]][bintray-lts] [![bintray-badge-lts-67]][bintray-lts-67] [![bintray-badge-downloads]][bintray-downloads] [![bintray-stats-badge]][bintray-stats] [![gitter-badge]][gitter] diff --git a/README.tpl.md b/README.tpl.md index 2b3b2daf..ec1a2484 100644 --- a/README.tpl.md +++ b/README.tpl.md @@ -1,8 +1,8 @@

sonar-scala

-[![circleci-badge]][circleci] [![coverage-badge]][coverage] -[![bintray-badge]][bintray] [![bintray-badge-lts]][bintray-lts] -[![bintray-badge-lts-67]][bintray-lts-67] +![](https://img.shields.io/github/workflow/status/sonar-scala/sonar-scala/Release/master) +[![coverage-badge]][coverage] [![bintray-badge]][bintray] +[![bintray-badge-lts]][bintray-lts] [![bintray-badge-lts-67]][bintray-lts-67] [![bintray-badge-downloads]][bintray-downloads] [![bintray-stats-badge]][bintray-stats] [![gitter-badge]][gitter] From 61541d1c1fc0bb12f1b0a63933155c971ceb2dd6 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Mon, 5 Apr 2021 15:18:56 +0100 Subject: [PATCH 108/142] Remove old compiler flag --- build.sbt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 8c1b9dde..47b68453 100644 --- a/build.sbt +++ b/build.sbt @@ -45,8 +45,7 @@ scalaVersion := "2.13.5" scalacOptions ++= Seq( "-language:reflectiveCalls", "-Ymacro-annotations", - "-Yrangepos", - "-Ywarn-unused" + "-Yrangepos" ) scalacOptions -= "-Xfatal-warnings" javacOptions := Seq("-Xlint:deprecation") From 472dfe8a38d9b0df9fdf777a853ade691e5d224a Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Mon, 5 Apr 2021 15:59:08 +0100 Subject: [PATCH 109/142] Bump sbt to 1.5 (#649) --- build.sbt | 2 ++ project/build.properties | 2 +- project/build.sbt | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 47b68453..5816ac65 100644 --- a/build.sbt +++ b/build.sbt @@ -162,6 +162,8 @@ logBuffered in Test := false testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-oDTF") // scalafix +semanticdbEnabled := true +semanticdbVersion := scalafixSemanticdb.revision scalafixDependencies in ThisBuild += "com.github.liancheng" %% "organize-imports" % "0.5.0" addCommandAlias("fix", "all compile:scalafix test:scalafix") addCommandAlias("fixCheck", "compile:scalafix --check; test:scalafix --check") diff --git a/project/build.properties b/project/build.properties index dbae93bc..e67343ae 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.9 +sbt.version=1.5.0 diff --git a/project/build.sbt b/project/build.sbt index 89597778..14219f24 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,4 +1,5 @@ scalaVersion := "2.12.11" +scalacOptions -= "-Wconf:cat=unused-nowarn:s" libraryDependencies ++= Seq( "org.sonarsource.update-center" % "sonar-update-center-common" % "1.26.0.846", // Scapegoat & scalastyle inspections generator dependencies From ad95d0afa5882da758dbfc30d1be5858918ffb10 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 5 Apr 2021 16:59:29 +0200 Subject: [PATCH 110/142] Update mouse to 1.0.2 (#647) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 5816ac65..f288f841 100644 --- a/build.sbt +++ b/build.sbt @@ -86,7 +86,7 @@ libraryDependencies ++= List( "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, "org.typelevel" %% "cats-core" % "2.5.0", "org.typelevel" %% "cats-effect" % "2.4.1", - "org.typelevel" %% "mouse" % "1.0.0", + "org.typelevel" %% "mouse" % "1.0.2", // TEST "com.beachape" %% "enumeratum-scalacheck" % "1.6.1" % Test, "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5" % Test, From 4ce0178253a168d585b690b712df09a621bbd603 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Mon, 5 Apr 2021 16:25:17 +0100 Subject: [PATCH 111/142] Update SonarQube to 8.7 (#650) --- build.sbt | 2 +- src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index f288f841..14c591e3 100644 --- a/build.sbt +++ b/build.sbt @@ -67,7 +67,7 @@ sourceGenerators in Compile ++= Seq( ) // Lib dependencies -val sonarVersion = "8.6.0.39681" +val sonarVersion = "8.7.0.41497" val circe = "0.13.0" val http4s = "0.21.21" libraryDependencies ++= List( diff --git a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala index 45d6d8f6..79587dda 100755 --- a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala @@ -28,7 +28,7 @@ import org.sonar.api.utils.Version class ScalaPluginSpec extends AnyFlatSpec with Matchers { val runtime: SonarRuntime = SonarRuntimeImpl.forSonarQube( - Version.create(8, 6), + Version.create(8, 7), SonarQubeSide.SCANNER, SonarEdition.COMMUNITY ) From f8a3c1deea891cf96eff994c480fdedb9977d8cb Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 14 Apr 2021 00:42:27 +0200 Subject: [PATCH 112/142] Update http4s-blaze-client, ... to 0.21.22 (#652) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 14c591e3..d9dfa965 100644 --- a/build.sbt +++ b/build.sbt @@ -69,7 +69,7 @@ sourceGenerators in Compile ++= Seq( // Lib dependencies val sonarVersion = "8.7.0.41497" val circe = "0.13.0" -val http4s = "0.21.21" +val http4s = "0.21.22" libraryDependencies ++= List( "com.beachape" %% "enumeratum" % "1.6.1", "com.beachape" %% "enumeratum-cats" % "1.6.1", From 190a55b088effb9f8f30d747274b4105dbaf34ab Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 14 Apr 2021 00:43:06 +0200 Subject: [PATCH 113/142] Update scalameta to 4.4.13 (#655) --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index 14219f24..a9f55b15 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -5,7 +5,7 @@ libraryDependencies ++= Seq( // Scapegoat & scalastyle inspections generator dependencies "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.8", "com.beautiful-scala" %% "scalastyle" % "1.5.0", - "org.scalameta" %% "scalameta" % "4.4.11", + "org.scalameta" %% "scalameta" % "4.4.13", "org.scalatest" %% "scalatest" % "3.2.7" % Test ) From 6c8e149885c5f4f8dcc55ca84d86e3998baf13c7 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 14 Apr 2021 00:43:36 +0200 Subject: [PATCH 114/142] Update mockito-scala to 1.16.37 (#653) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d9dfa965..80b8fbc2 100644 --- a/build.sbt +++ b/build.sbt @@ -92,7 +92,7 @@ libraryDependencies ++= List( "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5" % Test, "org.http4s" %% "http4s-blaze-server" % http4s % Test, "org.http4s" %% "http4s-dsl" % http4s % Test, - "org.mockito" %% "mockito-scala" % "1.16.33" % Test, + "org.mockito" %% "mockito-scala" % "1.16.37" % Test, "org.scalacheck" %% "scalacheck" % "1.15.3" % Test, "org.scalatest" %% "scalatest" % "3.2.7" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, From 847d270228e29a7b68084ec083664278ed90d4cf Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Wed, 14 Apr 2021 23:35:03 +0100 Subject: [PATCH 115/142] Update README --- README.md | 22 ++++++---------------- README.tpl.md | 22 ++++++---------------- vars.json | 2 +- 3 files changed, 13 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 57a3267c..6d5b4a94 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@

sonar-scala

![](https://img.shields.io/github/workflow/status/sonar-scala/sonar-scala/Release/master) -[![coverage-badge]][coverage] [![bintray-badge]][bintray] +[![coverage-badge]][coverage] [![sonatype-badge]][sonatype] [![bintray-badge-lts]][bintray-lts] [![bintray-badge-lts-67]][bintray-lts-67] -[![bintray-badge-downloads]][bintray-downloads] -[![bintray-stats-badge]][bintray-stats] [![gitter-badge]][gitter] +[![gitter-badge]][gitter] -[bintray]: https://bintray.com/mwz/maven/sonar-scala/8.6.0/link -[bintray-badge]: https://img.shields.io/badge/Download-8.6.0-blue.svg +[sonatype]: + https://s01.oss.sonatype.org/content/repositories/releases/com/sonar-scala/sonar-scala_2.13/8.7.0/sonar-scala_2.13-8.7.0-assembly.jar +[sonatype-badge]: https://img.shields.io/badge/Download-8.7.0-blue.svg [bintray-badge-lts]: https://img.shields.io/badge/Download-7.9.0_(for_SonarQube_7.9_LTS)-blue.svg [bintray-badge-lts-67]: @@ -15,16 +15,6 @@ [bintray-lts]: https://bintray.com/mwz/maven/sonar-scala/7.9.0/link [bintray-lts-67]: https://bintray.com/mwz/maven/sonar-scala/6.8.0/link -[bintray-downloads]: - https://bintray.com/beta/#/mwz/maven/sonar-scala?tab=statistics -[bintray-badge-downloads]: - https://img.shields.io/bintray/dt/mwz/maven/sonar-scala?label=Downloads -[bintray-stats]: https://bintray.com/mwz/maven/sonar-scala#statistics -[bintray-stats-badge]: - https://img.shields.io/badge/dynamic/json.svg?uri=https://bintray.com/statistics/packageStatistics?pkgPath=/mwz/maven/sonar-scala&query=$.totalDownloads&label=Downloads+(last+30+days)&colorB=green -[circleci]: https://circleci.com/gh/mwz/sonar-scala -[circleci-badge]: - https://img.shields.io/circleci/project/github/mwz/sonar-scala/master.svg?label=Build [coverage]: https://sonar.sonar-scala.com/component_measures?id=sonar-scala&metric=coverage [coverage-badge]: @@ -42,7 +32,7 @@ sonar-scala is an independent SonarQube plugin, driven by and developed with Intended for [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts), [SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts), -[SonarQube 8.5](https://www.sonarqube.org/sonarqube-8-5) and Scala +[SonarQube 8.7](https://www.sonarqube.org/sonarqube-8-7) and Scala 2.11/2.12/2.13. sonar-scala is developed in Scala. It uses the diff --git a/README.tpl.md b/README.tpl.md index ec1a2484..765c79fc 100644 --- a/README.tpl.md +++ b/README.tpl.md @@ -1,13 +1,13 @@

sonar-scala

![](https://img.shields.io/github/workflow/status/sonar-scala/sonar-scala/Release/master) -[![coverage-badge]][coverage] [![bintray-badge]][bintray] +[![coverage-badge]][coverage] [![sonatype-badge]][sonatype] [![bintray-badge-lts]][bintray-lts] [![bintray-badge-lts-67]][bintray-lts-67] -[![bintray-badge-downloads]][bintray-downloads] -[![bintray-stats-badge]][bintray-stats] [![gitter-badge]][gitter] +[![gitter-badge]][gitter] -[bintray]: https://bintray.com/mwz/maven/sonar-scala/{{version}}/link -[bintray-badge]: https://img.shields.io/badge/Download-{{version}}-blue.svg +[sonatype]: + https://s01.oss.sonatype.org/content/repositories/releases/com/sonar-scala/sonar-scala_2.13/{{version}}/sonar-scala_2.13-{{version}}-assembly.jar +[sonatype-badge]: https://img.shields.io/badge/Download-{{version}}-blue.svg [bintray-badge-lts]: https://img.shields.io/badge/Download-{{ltsVersion}}_(for_SonarQube_7.9_LTS)-blue.svg [bintray-badge-lts-67]: @@ -15,16 +15,6 @@ [bintray-lts]: https://bintray.com/mwz/maven/sonar-scala/{{ltsVersion}}/link [bintray-lts-67]: https://bintray.com/mwz/maven/sonar-scala/{{lts67Version}}/link -[bintray-downloads]: - https://bintray.com/beta/#/mwz/maven/sonar-scala?tab=statistics -[bintray-badge-downloads]: - https://img.shields.io/bintray/dt/mwz/maven/sonar-scala?label=Downloads -[bintray-stats]: https://bintray.com/mwz/maven/sonar-scala#statistics -[bintray-stats-badge]: - https://img.shields.io/badge/dynamic/json.svg?uri=https://bintray.com/statistics/packageStatistics?pkgPath=/mwz/maven/sonar-scala&query=$.totalDownloads&label=Downloads+(last+30+days)&colorB=green -[circleci]: https://circleci.com/gh/mwz/sonar-scala -[circleci-badge]: - https://img.shields.io/circleci/project/github/mwz/sonar-scala/master.svg?label=Build [coverage]: https://sonar.sonar-scala.com/component_measures?id=sonar-scala&metric=coverage [coverage-badge]: @@ -42,7 +32,7 @@ sonar-scala is an independent SonarQube plugin, driven by and developed with Intended for [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts), [SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts), -[SonarQube 8.5](https://www.sonarqube.org/sonarqube-8-5) and Scala +[SonarQube 8.7](https://www.sonarqube.org/sonarqube-8-7) and Scala 2.11/2.12/2.13. sonar-scala is developed in Scala. It uses the diff --git a/vars.json b/vars.json index d8131995..4e962d3a 100644 --- a/vars.json +++ b/vars.json @@ -1,5 +1,5 @@ { - "version": "8.6.0", + "version": "8.7.0", "ltsVersion": "7.9.0", "lts67Version": "6.8.0" } From c92778ee6c8c0dc155e12c42756cc58fc8fab09a Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 1 May 2021 18:31:03 +0200 Subject: [PATCH 116/142] Update sbt-scoverage to 1.7.0 (#663) --- examples/sbt/multi-module/project/plugins.sbt | 2 +- examples/sbt/single-module/project/plugins.sbt | 2 +- project/plugins.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sbt/multi-module/project/plugins.sbt b/examples/sbt/multi-module/project/plugins.sbt index b01d6e4c..023bf56c 100644 --- a/examples/sbt/multi-module/project/plugins.sbt +++ b/examples/sbt/multi-module/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.0") addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.0") diff --git a/examples/sbt/single-module/project/plugins.sbt b/examples/sbt/single-module/project/plugins.sbt index b01d6e4c..023bf56c 100644 --- a/examples/sbt/single-module/project/plugins.sbt +++ b/examples/sbt/single-module/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.0") addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.0") diff --git a/project/plugins.sbt b/project/plugins.sbt index c7e45bc8..9aa9a8bd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.17") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.0") From b04251b209e06366eea3e8a9083b72e219cbd914 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 1 May 2021 18:32:13 +0200 Subject: [PATCH 117/142] Update scalameta to 4.4.15 (#662) --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index a9f55b15..bdf867d9 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -5,7 +5,7 @@ libraryDependencies ++= Seq( // Scapegoat & scalastyle inspections generator dependencies "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.8", "com.beautiful-scala" %% "scalastyle" % "1.5.0", - "org.scalameta" %% "scalameta" % "4.4.13", + "org.scalameta" %% "scalameta" % "4.4.15", "org.scalatest" %% "scalatest" % "3.2.7" % Test ) From cdb949503fe913c19203583690aa4893b02b0a62 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 1 May 2021 18:32:23 +0200 Subject: [PATCH 118/142] Update sbt to 1.5.1 (#661) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e67343ae..f0be67b9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.0 +sbt.version=1.5.1 From 2aa074193d08de2c24bfabd8b875d0cdf52fcf48 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 1 May 2021 18:33:08 +0200 Subject: [PATCH 119/142] Update scalatest to 3.2.8 (#659) Co-authored-by: Michael Wizner --- build.sbt | 2 +- examples/sbt/multi-module/build.sbt | 2 +- examples/sbt/single-module/build.sbt | 2 +- project/build.sbt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 80b8fbc2..876481af 100644 --- a/build.sbt +++ b/build.sbt @@ -94,7 +94,7 @@ libraryDependencies ++= List( "org.http4s" %% "http4s-dsl" % http4s % Test, "org.mockito" %% "mockito-scala" % "1.16.37" % Test, "org.scalacheck" %% "scalacheck" % "1.15.3" % Test, - "org.scalatest" %% "scalatest" % "3.2.7" % Test, + "org.scalatest" %% "scalatest" % "3.2.8" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test, "com.softwaremill.diffx" %% "diffx-scalatest" % "0.3.30" % Test, diff --git a/examples/sbt/multi-module/build.sbt b/examples/sbt/multi-module/build.sbt index 36b63858..efa3422d 100644 --- a/examples/sbt/multi-module/build.sbt +++ b/examples/sbt/multi-module/build.sbt @@ -1,6 +1,6 @@ lazy val baseSettings = Seq( scalaVersion := "2.12.8", - libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.7" % "test", + libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.8" % "test", scapegoatVersion in ThisBuild := "1.3.9" ) diff --git a/examples/sbt/single-module/build.sbt b/examples/sbt/single-module/build.sbt index d46c098a..4ab7bad3 100644 --- a/examples/sbt/single-module/build.sbt +++ b/examples/sbt/single-module/build.sbt @@ -1,4 +1,4 @@ name := "sbt-single-module" scalaVersion := "2.12.8" -libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.7" % "test" +libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.8" % "test" scapegoatVersion in ThisBuild := "1.3.9" diff --git a/project/build.sbt b/project/build.sbt index bdf867d9..15af5de7 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -6,7 +6,7 @@ libraryDependencies ++= Seq( "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.8", "com.beautiful-scala" %% "scalastyle" % "1.5.0", "org.scalameta" %% "scalameta" % "4.4.15", - "org.scalatest" %% "scalatest" % "3.2.7" % Test + "org.scalatest" %% "scalatest" % "3.2.8" % Test ) // Adding a resolver to the Artima maven repo, so sbt can download the Artima SuperSafe sbt plugin From 1a3cc6d6cf806febf773c9e2697e4dd464b20a35 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 1 May 2021 18:33:32 +0200 Subject: [PATCH 120/142] Update cats-effect to 2.5.0 (#658) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 876481af..878aa6d3 100644 --- a/build.sbt +++ b/build.sbt @@ -85,7 +85,7 @@ libraryDependencies ++= List( "org.slf4j" % "slf4j-api" % "1.7.30" % Provided, "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, "org.typelevel" %% "cats-core" % "2.5.0", - "org.typelevel" %% "cats-effect" % "2.4.1", + "org.typelevel" %% "cats-effect" % "2.5.0", "org.typelevel" %% "mouse" % "1.0.2", // TEST "com.beachape" %% "enumeratum-scalacheck" % "1.6.1" % Test, From b082d5332737e0f2aae8302c067d49d5afe17a4b Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 1 May 2021 18:38:14 +0200 Subject: [PATCH 121/142] Update cats-core to 2.6.0 (#657) Co-authored-by: Michael Wizner --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 878aa6d3..f90cce0d 100644 --- a/build.sbt +++ b/build.sbt @@ -84,7 +84,7 @@ libraryDependencies ++= List( "org.scalariform" %% "scalariform" % "0.2.10", "org.slf4j" % "slf4j-api" % "1.7.30" % Provided, "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, - "org.typelevel" %% "cats-core" % "2.5.0", + "org.typelevel" %% "cats-core" % "2.6.0", "org.typelevel" %% "cats-effect" % "2.5.0", "org.typelevel" %% "mouse" % "1.0.2", // TEST From 894b7606f9b9b572e425ed127d7192d19b3ea5cb Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 22 May 2021 17:12:48 +0200 Subject: [PATCH 122/142] Update sbt-sonar to 2.3.0 (#665) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9aa9a8bd..8fdc527a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.12") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") -addSbtPlugin("com.sonar-scala" % "sbt-sonar" % "2.2.1") +addSbtPlugin("com.sonar-scala" % "sbt-sonar" % "2.3.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.17") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") From 138ec7feec3e7e28320063eb939b55d4b8fd58cc Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 22 May 2021 17:13:08 +0200 Subject: [PATCH 123/142] Update scalacheck to 1.15.4 (#668) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f90cce0d..17a2437f 100644 --- a/build.sbt +++ b/build.sbt @@ -93,7 +93,7 @@ libraryDependencies ++= List( "org.http4s" %% "http4s-blaze-server" % http4s % Test, "org.http4s" %% "http4s-dsl" % http4s % Test, "org.mockito" %% "mockito-scala" % "1.16.37" % Test, - "org.scalacheck" %% "scalacheck" % "1.15.3" % Test, + "org.scalacheck" %% "scalacheck" % "1.15.4" % Test, "org.scalatest" %% "scalatest" % "3.2.8" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test, From 87dec3d2909c192a0484a4f3afec742236517d20 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 22 May 2021 17:13:33 +0200 Subject: [PATCH 124/142] Update sbt-scoverage to 1.7.3 (#669) --- examples/sbt/multi-module/project/plugins.sbt | 2 +- examples/sbt/single-module/project/plugins.sbt | 2 +- project/plugins.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sbt/multi-module/project/plugins.sbt b/examples/sbt/multi-module/project/plugins.sbt index 023bf56c..5fb39770 100644 --- a/examples/sbt/multi-module/project/plugins.sbt +++ b/examples/sbt/multi-module/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.3") addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.0") diff --git a/examples/sbt/single-module/project/plugins.sbt b/examples/sbt/single-module/project/plugins.sbt index 023bf56c..5fb39770 100644 --- a/examples/sbt/single-module/project/plugins.sbt +++ b/examples/sbt/single-module/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.3") addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.0") diff --git a/project/plugins.sbt b/project/plugins.sbt index 8fdc527a..323f47f6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.17") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.3") From 4e48a8a4dcdde93ab5971046f9830ddcc3a221cf Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 22 May 2021 17:13:51 +0200 Subject: [PATCH 125/142] Update sbt-tpolecat to 0.1.18 (#683) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 323f47f6..1d25274d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") addSbtPlugin("com.sksamuel.scapegoat" % "sbt-scapegoat" % "1.1.0") addSbtPlugin("com.sonar-scala" % "sbt-sonar" % "2.3.0") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.17") +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.18") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.3") From 47ff01882db246e6df1a4ff2f41ac5604c6f1a79 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 22 May 2021 17:14:16 +0200 Subject: [PATCH 126/142] Update sbt-scalafix to 0.9.28 (#682) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1d25274d..3276d86c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.27") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.28") addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.12") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") From 0c7f95fd53cbdac14de40ab8084ab76fab1818b5 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 22 May 2021 17:14:43 +0200 Subject: [PATCH 127/142] Update scalameta to 4.4.18 (#680) --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index 15af5de7..625247f2 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -5,7 +5,7 @@ libraryDependencies ++= Seq( // Scapegoat & scalastyle inspections generator dependencies "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.8", "com.beautiful-scala" %% "scalastyle" % "1.5.0", - "org.scalameta" %% "scalameta" % "4.4.15", + "org.scalameta" %% "scalameta" % "4.4.18", "org.scalatest" %% "scalatest" % "3.2.8" % Test ) From 6e60fc99581bf3e8ea0afbd980cdc8f73765e2c1 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 22 May 2021 17:15:18 +0200 Subject: [PATCH 128/142] Update http4s-blaze-client, ... to 0.21.23 (#678) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 17a2437f..9c20f76c 100644 --- a/build.sbt +++ b/build.sbt @@ -69,7 +69,7 @@ sourceGenerators in Compile ++= Seq( // Lib dependencies val sonarVersion = "8.7.0.41497" val circe = "0.13.0" -val http4s = "0.21.22" +val http4s = "0.21.23" libraryDependencies ++= List( "com.beachape" %% "enumeratum" % "1.6.1", "com.beachape" %% "enumeratum-cats" % "1.6.1", From 8af23251e81fe02dbfdec220d15399d6e9c565c5 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 22 May 2021 17:28:06 +0200 Subject: [PATCH 129/142] Update scalatest to 3.2.9 (#677) Co-authored-by: Michael Wizner --- build.sbt | 2 +- examples/sbt/multi-module/build.sbt | 2 +- examples/sbt/single-module/build.sbt | 2 +- project/build.sbt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 9c20f76c..376700fc 100644 --- a/build.sbt +++ b/build.sbt @@ -94,7 +94,7 @@ libraryDependencies ++= List( "org.http4s" %% "http4s-dsl" % http4s % Test, "org.mockito" %% "mockito-scala" % "1.16.37" % Test, "org.scalacheck" %% "scalacheck" % "1.15.4" % Test, - "org.scalatest" %% "scalatest" % "3.2.8" % Test, + "org.scalatest" %% "scalatest" % "3.2.9" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test, "com.softwaremill.diffx" %% "diffx-scalatest" % "0.3.30" % Test, diff --git a/examples/sbt/multi-module/build.sbt b/examples/sbt/multi-module/build.sbt index efa3422d..af8a93be 100644 --- a/examples/sbt/multi-module/build.sbt +++ b/examples/sbt/multi-module/build.sbt @@ -1,6 +1,6 @@ lazy val baseSettings = Seq( scalaVersion := "2.12.8", - libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.8" % "test", + libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.9" % "test", scapegoatVersion in ThisBuild := "1.3.9" ) diff --git a/examples/sbt/single-module/build.sbt b/examples/sbt/single-module/build.sbt index 4ab7bad3..57119c0b 100644 --- a/examples/sbt/single-module/build.sbt +++ b/examples/sbt/single-module/build.sbt @@ -1,4 +1,4 @@ name := "sbt-single-module" scalaVersion := "2.12.8" -libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.8" % "test" +libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.9" % "test" scapegoatVersion in ThisBuild := "1.3.9" diff --git a/project/build.sbt b/project/build.sbt index 625247f2..b991ff73 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -6,7 +6,7 @@ libraryDependencies ++= Seq( "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % "1.4.8", "com.beautiful-scala" %% "scalastyle" % "1.5.0", "org.scalameta" %% "scalameta" % "4.4.18", - "org.scalatest" %% "scalatest" % "3.2.8" % Test + "org.scalatest" %% "scalatest" % "3.2.9" % Test ) // Adding a resolver to the Artima maven repo, so sbt can download the Artima SuperSafe sbt plugin From b83e246abd133a306e1386b5987d9600f0dab863 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 22 May 2021 17:28:45 +0200 Subject: [PATCH 130/142] Update cats-effect to 2.5.1 (#675) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 376700fc..78d155bd 100644 --- a/build.sbt +++ b/build.sbt @@ -85,7 +85,7 @@ libraryDependencies ++= List( "org.slf4j" % "slf4j-api" % "1.7.30" % Provided, "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, "org.typelevel" %% "cats-core" % "2.6.0", - "org.typelevel" %% "cats-effect" % "2.5.0", + "org.typelevel" %% "cats-effect" % "2.5.1", "org.typelevel" %% "mouse" % "1.0.2", // TEST "com.beachape" %% "enumeratum-scalacheck" % "1.6.1" % Test, From 6fddc7eb3c3e7203b1fb53fecd9fb2d6514355ab Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 22 May 2021 17:30:33 +0200 Subject: [PATCH 131/142] Update sbt to 1.5.2 (#671) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index f0be67b9..19479ba4 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.1 +sbt.version=1.5.2 From e317faf5cf87171ac270ecd379866f7953edb5d8 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 22 May 2021 17:35:14 +0200 Subject: [PATCH 132/142] Update cats-core to 2.6.1 (#674) Co-authored-by: Michael Wizner --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 78d155bd..c5087a27 100644 --- a/build.sbt +++ b/build.sbt @@ -84,7 +84,7 @@ libraryDependencies ++= List( "org.scalariform" %% "scalariform" % "0.2.10", "org.slf4j" % "slf4j-api" % "1.7.30" % Provided, "org.sonarsource.sonarqube" % "sonar-plugin-api" % sonarVersion % Provided, - "org.typelevel" %% "cats-core" % "2.6.0", + "org.typelevel" %% "cats-core" % "2.6.1", "org.typelevel" %% "cats-effect" % "2.5.1", "org.typelevel" %% "mouse" % "1.0.2", // TEST From 64bb128b41e386ef0bf14ed0228830abfa64029b Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 22 May 2021 17:37:09 +0100 Subject: [PATCH 133/142] Bump sbt (#684) --- project/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.sbt b/project/build.sbt index b991ff73..3790d27c 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.12.11" +scalaVersion := "2.12.13" scalacOptions -= "-Wconf:cat=unused-nowarn:s" libraryDependencies ++= Seq( "org.sonarsource.update-center" % "sonar-update-center-common" % "1.26.0.846", From f2379591cfd96ae0bf924bdd332dfa02b1706bf3 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 22 May 2021 17:54:19 +0100 Subject: [PATCH 134/142] Bump diffx (#687) --- build.sbt | 2 +- .../mwz/sonar/scala/scoverage/ScoverageReportParserSpec.scala | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index c5087a27..4884f066 100644 --- a/build.sbt +++ b/build.sbt @@ -97,7 +97,7 @@ libraryDependencies ++= List( "org.scalatest" %% "scalatest" % "3.2.9" % Test, "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % Test, "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % Test, - "com.softwaremill.diffx" %% "diffx-scalatest" % "0.3.30" % Test, + "com.softwaremill.diffx" %% "diffx-scalatest" % "0.4.5" % Test, "org.sonarsource.sonarqube" % "sonar-plugin-api-impl" % sonarVersion % Test ) diff --git a/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParserSpec.scala b/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParserSpec.scala index 4afeef76..e55fc01d 100644 --- a/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParserSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParserSpec.scala @@ -20,6 +20,7 @@ package scoverage import java.nio.file.Paths +import com.softwaremill.diffx.generic.auto._ import com.softwaremill.diffx.scalatest.DiffMatcher import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers From 736a58671eafb46a5e5abb88d164fcbd9ec0d4c5 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 22 May 2021 19:00:00 +0200 Subject: [PATCH 135/142] Update sbt-scoverage to 1.8.1 (#685) Co-authored-by: Michael Wizner --- examples/sbt/multi-module/project/plugins.sbt | 2 +- examples/sbt/single-module/project/plugins.sbt | 2 +- project/plugins.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/sbt/multi-module/project/plugins.sbt b/examples/sbt/multi-module/project/plugins.sbt index 5fb39770..0e27e167 100644 --- a/examples/sbt/multi-module/project/plugins.sbt +++ b/examples/sbt/multi-module/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.3") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.1") addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.0") diff --git a/examples/sbt/single-module/project/plugins.sbt b/examples/sbt/single-module/project/plugins.sbt index 5fb39770..0e27e167 100644 --- a/examples/sbt/single-module/project/plugins.sbt +++ b/examples/sbt/single-module/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.3") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.1") addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.0") diff --git a/project/plugins.sbt b/project/plugins.sbt index 3276d86c..3be40c87 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.18") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.3") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.1") From b744f4387f2c0f604f7610bd5ab867831fed55c0 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Thu, 16 Dec 2021 00:25:34 +0000 Subject: [PATCH 136/142] Update SonarQube to 8.9 LTS (#782) --- build.sbt | 2 +- src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 4884f066..0a68b40a 100644 --- a/build.sbt +++ b/build.sbt @@ -67,7 +67,7 @@ sourceGenerators in Compile ++= Seq( ) // Lib dependencies -val sonarVersion = "8.7.0.41497" +val sonarVersion = "8.9.0.43852" val circe = "0.13.0" val http4s = "0.21.23" libraryDependencies ++= List( diff --git a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala index 79587dda..0c8616c9 100755 --- a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala @@ -28,7 +28,7 @@ import org.sonar.api.utils.Version class ScalaPluginSpec extends AnyFlatSpec with Matchers { val runtime: SonarRuntime = SonarRuntimeImpl.forSonarQube( - Version.create(8, 7), + Version.create(8, 9), SonarQubeSide.SCANNER, SonarEdition.COMMUNITY ) From 9e19e2d7688ca3316dffbd4f9bbd616167cac1b7 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Thu, 16 Dec 2021 00:41:50 +0000 Subject: [PATCH 137/142] Update README --- README.md | 15 ++++++++++----- README.tpl.md | 15 ++++++++++----- vars.json | 3 ++- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 6d5b4a94..921519d8 100644 --- a/README.md +++ b/README.md @@ -2,17 +2,21 @@ ![](https://img.shields.io/github/workflow/status/sonar-scala/sonar-scala/Release/master) [![coverage-badge]][coverage] [![sonatype-badge]][sonatype] -[![bintray-badge-lts]][bintray-lts] [![bintray-badge-lts-67]][bintray-lts-67] -[![gitter-badge]][gitter] +[![bintray-badge-lts]][bintray-lts] [![bintray-badge-lts-79]][bintray-lts-79] +[![bintray-badge-lts-67]][bintray-lts-67] [![gitter-badge]][gitter] [sonatype]: https://s01.oss.sonatype.org/content/repositories/releases/com/sonar-scala/sonar-scala_2.13/8.7.0/sonar-scala_2.13-8.7.0-assembly.jar [sonatype-badge]: https://img.shields.io/badge/Download-8.7.0-blue.svg [bintray-badge-lts]: + https://img.shields.io/badge/Download-8.9.0_(for_SonarQube_8.9_LTS)-blue.svg +[bintray-badge-lts-79]: https://img.shields.io/badge/Download-7.9.0_(for_SonarQube_7.9_LTS)-blue.svg [bintray-badge-lts-67]: https://img.shields.io/badge/Download-6.8.0_(for_SonarQube_6.7_LTS)-blue.svg -[bintray-lts]: https://bintray.com/mwz/maven/sonar-scala/7.9.0/link +[bintray-lts]: https://bintray.com/mwz/maven/sonar-scala/8.9.0/link +[bintray-lts-79]: + https://bintray.com/mwz/maven/sonar-scala/7.9.0/link [bintray-lts-67]: https://bintray.com/mwz/maven/sonar-scala/6.8.0/link [coverage]: @@ -30,9 +34,10 @@ sonar-scala is an independent SonarQube plugin, driven by and developed with :heart: by the [community](https://github.com/mwz/sonar-scala/graphs/contributors). -Intended for [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts), +Intended for [SonarQube 8.7](https://www.sonarqube.org/sonarqube-8-7), +[SonarQube 8.9 LTS](https://www.sonarqube.org/sonarqube-8-7), [SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts), -[SonarQube 8.7](https://www.sonarqube.org/sonarqube-8-7) and Scala +[SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts) and Scala 2.11/2.12/2.13. sonar-scala is developed in Scala. It uses the diff --git a/README.tpl.md b/README.tpl.md index 765c79fc..12eadb6e 100644 --- a/README.tpl.md +++ b/README.tpl.md @@ -2,17 +2,21 @@ ![](https://img.shields.io/github/workflow/status/sonar-scala/sonar-scala/Release/master) [![coverage-badge]][coverage] [![sonatype-badge]][sonatype] -[![bintray-badge-lts]][bintray-lts] [![bintray-badge-lts-67]][bintray-lts-67] -[![gitter-badge]][gitter] +[![bintray-badge-lts]][bintray-lts] [![bintray-badge-lts-79]][bintray-lts-79] +[![bintray-badge-lts-67]][bintray-lts-67] [![gitter-badge]][gitter] [sonatype]: https://s01.oss.sonatype.org/content/repositories/releases/com/sonar-scala/sonar-scala_2.13/{{version}}/sonar-scala_2.13-{{version}}-assembly.jar [sonatype-badge]: https://img.shields.io/badge/Download-{{version}}-blue.svg [bintray-badge-lts]: - https://img.shields.io/badge/Download-{{ltsVersion}}_(for_SonarQube_7.9_LTS)-blue.svg + https://img.shields.io/badge/Download-{{ltsVersion}}_(for_SonarQube_8.9_LTS)-blue.svg +[bintray-badge-lts-79]: + https://img.shields.io/badge/Download-{{lts79Version}}_(for_SonarQube_7.9_LTS)-blue.svg [bintray-badge-lts-67]: https://img.shields.io/badge/Download-{{lts67Version}}_(for_SonarQube_6.7_LTS)-blue.svg [bintray-lts]: https://bintray.com/mwz/maven/sonar-scala/{{ltsVersion}}/link +[bintray-lts-79]: + https://bintray.com/mwz/maven/sonar-scala/{{lts79Version}}/link [bintray-lts-67]: https://bintray.com/mwz/maven/sonar-scala/{{lts67Version}}/link [coverage]: @@ -30,9 +34,10 @@ sonar-scala is an independent SonarQube plugin, driven by and developed with :heart: by the [community](https://github.com/mwz/sonar-scala/graphs/contributors). -Intended for [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts), +Intended for [SonarQube 8.7](https://www.sonarqube.org/sonarqube-8-7), +[SonarQube 8.9 LTS](https://www.sonarqube.org/sonarqube-8-7), [SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts), -[SonarQube 8.7](https://www.sonarqube.org/sonarqube-8-7) and Scala +[SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts) and Scala 2.11/2.12/2.13. sonar-scala is developed in Scala. It uses the diff --git a/vars.json b/vars.json index 4e962d3a..f3cc6cd7 100644 --- a/vars.json +++ b/vars.json @@ -1,5 +1,6 @@ { "version": "8.7.0", - "ltsVersion": "7.9.0", + "ltsVersion": "8.9.0", + "lts79Version": "7.9.0", "lts67Version": "6.8.0" } From 1fe24cf2b2bad8f116a892afba4902d28ca6db99 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 19 Feb 2022 14:49:52 +0000 Subject: [PATCH 138/142] clean up readme --- README.md | 8 ++------ README.tpl.md | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 921519d8..73a8147f 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@

sonar-scala

![](https://img.shields.io/github/workflow/status/sonar-scala/sonar-scala/Release/master) -[![coverage-badge]][coverage] [![sonatype-badge]][sonatype] -[![bintray-badge-lts]][bintray-lts] [![bintray-badge-lts-79]][bintray-lts-79] +[![sonatype-badge]][sonatype] [![bintray-badge-lts]][bintray-lts] +[![bintray-badge-lts-79]][bintray-lts-79] [![bintray-badge-lts-67]][bintray-lts-67] [![gitter-badge]][gitter] [sonatype]: @@ -19,10 +19,6 @@ https://bintray.com/mwz/maven/sonar-scala/7.9.0/link [bintray-lts-67]: https://bintray.com/mwz/maven/sonar-scala/6.8.0/link -[coverage]: - https://sonar.sonar-scala.com/component_measures?id=sonar-scala&metric=coverage -[coverage-badge]: - https://sonar.sonar-scala.com/api/project_badges/measure?project=sonar-scala&metric=coverage [gitter]: https://gitter.im/sonar-scala/sonar-scala [gitter-badge]: https://img.shields.io/gitter/room/sonar-scala/sonar-scala.svg?colorB=46BC99&label=Chat diff --git a/README.tpl.md b/README.tpl.md index 12eadb6e..708a038f 100644 --- a/README.tpl.md +++ b/README.tpl.md @@ -1,8 +1,8 @@

sonar-scala

![](https://img.shields.io/github/workflow/status/sonar-scala/sonar-scala/Release/master) -[![coverage-badge]][coverage] [![sonatype-badge]][sonatype] -[![bintray-badge-lts]][bintray-lts] [![bintray-badge-lts-79]][bintray-lts-79] +[![sonatype-badge]][sonatype] [![bintray-badge-lts]][bintray-lts] +[![bintray-badge-lts-79]][bintray-lts-79] [![bintray-badge-lts-67]][bintray-lts-67] [![gitter-badge]][gitter] [sonatype]: @@ -19,10 +19,6 @@ https://bintray.com/mwz/maven/sonar-scala/{{lts79Version}}/link [bintray-lts-67]: https://bintray.com/mwz/maven/sonar-scala/{{lts67Version}}/link -[coverage]: - https://sonar.sonar-scala.com/component_measures?id=sonar-scala&metric=coverage -[coverage-badge]: - https://sonar.sonar-scala.com/api/project_badges/measure?project=sonar-scala&metric=coverage [gitter]: https://gitter.im/sonar-scala/sonar-scala [gitter-badge]: https://img.shields.io/gitter/room/sonar-scala/sonar-scala.svg?colorB=46BC99&label=Chat From 69176975ea9d14be5957db61079af479cee9e245 Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 19 Feb 2022 14:50:20 +0000 Subject: [PATCH 139/142] remove sonar-scan workflow --- .github/workflows/sonar-scan.yml | 116 ------------------------------- 1 file changed, 116 deletions(-) delete mode 100644 .github/workflows/sonar-scan.yml diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml deleted file mode 100644 index bd2eb7a2..00000000 --- a/.github/workflows/sonar-scan.yml +++ /dev/null @@ -1,116 +0,0 @@ -name: sonar-scan -on: - push: - branches: [master] - tags: ["*"] -env: - SONAR_SCANNER_VERSION: "4.2.0.1873" -jobs: - test: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - run: git fetch --prune --unshallow - - uses: olafurpg/setup-scala@v10 - with: - java-version: adopt@1.8 - - uses: actions/cache@v1 - with: - path: ~/.ivy2/cache - key: ivy-${{hashFiles('**/*.sbt')}} - restore-keys: ivy- - - uses: actions/cache@v1 - with: - path: ~/.sbt - key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} - restore-keys: sbt- - - run: sbt 'clean; coverage; test; coverageReport; scapegoat' < /dev/null - - uses: actions/upload-artifact@v2 - with: - name: scoverage - path: target/scala-2.13/scoverage-report/scoverage.xml - - uses: actions/upload-artifact@v2 - with: - name: scapegoat - path: target/scala-2.13/scapegoat-report/scapegoat.xml - - uses: actions/upload-artifact@v2 - with: - name: junit - path: target/test-reports/* - sonar-scan: - runs-on: ubuntu-20.04 - needs: test - steps: - - uses: actions/checkout@v2 - - run: git fetch --prune --unshallow - - uses: olafurpg/setup-scala@v10 - with: - java-version: adopt@1.8 - - uses: actions/cache@v1 - with: - path: ~/.ivy2/cache - key: ivy-${{hashFiles('**/*.sbt')}} - restore-keys: ivy- - - uses: actions/cache@v1 - with: - path: ~/.sbt - key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} - restore-keys: sbt- - - uses: actions/download-artifact@v2 - with: - name: scapegoat - path: target/scala-2.13/scapegoat-report - - uses: actions/download-artifact@v2 - with: - name: scoverage - path: target/scala-2.13/scoverage-report - - uses: actions/download-artifact@v2 - with: - name: junit - path: target/test-reports - - run: | - sbt -Dsonar.host.url=${SONARQUBE_URL} \ - -Dsonar.login=${SONARQUBE_ACCESS_TOKEN} \ - sonarScan < /dev/null - env: - SONARQUBE_URL: ${{secrets.SONARQUBE_URL}} - SONARQUBE_ACCESS_TOKEN: ${{secrets.SONARQUBE_ACCESS_TOKEN}} - sonar-scan-examples: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - run: git fetch --prune --unshallow - - uses: olafurpg/setup-scala@v10 - with: - java-version: adopt@1.8 - - uses: actions/cache@v1 - with: - path: ~/.ivy2/cache - key: ivy-${{hashFiles('**/*.sbt')}} - restore-keys: ivy- - - uses: actions/cache@v1 - with: - path: ~/.sbt - key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}} - restore-keys: sbt- - - run: echo "$SONAR_SCANNER_VERSION" > ~/sonar-scanner-version - - uses: actions/cache@v1 - with: - path: ~/.sonar/cache - key: sonar-scanner-${{hashFiles('~/sonar-scanner-version')}} - restore-keys: sonar-scanner- - - run: | - sudo add-apt-repository ppa:cwchien/gradle && sudo apt-get update && \ - sudo apt-get install -y wget maven gradle - - run: | - wget -O ~/sonar-scanner.zip \ - "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip" && \ - sudo unzip ~/sonar-scanner.zip -d /opt && \ - rm ~/sonar-scanner.zip - - run: | - export SONAR_SCANNER_HOME="/opt/sonar-scanner-${SONAR_SCANNER_VERSION}" && \ - export PATH="${PATH}:${SONAR_SCANNER_HOME}/bin" && \ - cd examples && ./scan.sh - env: - SONARQUBE_URL: ${{secrets.SONARQUBE_URL}} - SONARQUBE_ACCESS_TOKEN: ${{secrets.SONARQUBE_ACCESS_TOKEN}} From 878054cd3ddb027dc58098008ed73e4bd0a6867e Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Sat, 19 Feb 2022 14:53:53 +0000 Subject: [PATCH 140/142] update source headers --- .../main/resources/ScapegoatInspections.scala | 2 +- .../scalastyle/ScalastyleInspections.scala | 2 +- .../ScalastyleInspectionsGenerator.scala | 2 +- .../ScapegoatInspectionsGenerator.scala | 24 +++++++++---------- .../ScalastyleInspectionsGeneratorTest.scala | 2 +- .../ScapegoatInspectionsGeneratorSpec.scala | 2 +- .../com/mwz/sonar/scala/EmptyLogger.scala | 2 +- .../mwz/sonar/scala/GlobalConfigSpec.scala | 2 +- .../com/mwz/sonar/scala/ScalaPluginSpec.scala | 2 +- .../scala/com/mwz/sonar/scala/ScalaSpec.scala | 2 +- .../sonar/scala/SensorContextMatchers.scala | 2 +- .../scala/com/mwz/sonar/scala/fixtures.scala | 2 +- .../scala/junit/JUnitReportParserSpec.scala | 2 +- .../sonar/scala/junit/JUnitSensorSpec.scala | 2 +- .../ScalastyleRulesReposotorySpec.scala | 2 +- .../scalastyle/ScalastyleRulesSpec.scala | 2 +- .../scapegoat/ScapegoatRulesSpec.scala | 2 +- .../com/mwz/sonar/scala/pr/Generators.scala | 2 +- .../scala/pr/GithubPrReviewJobSpec.scala | 2 +- .../mwz/sonar/scala/pr/GlobalIssuesSpec.scala | 2 +- .../com/mwz/sonar/scala/pr/MarkdownSpec.scala | 2 +- .../com/mwz/sonar/scala/pr/PatchSpec.scala | 2 +- .../mwz/sonar/scala/pr/ReviewStatusSpec.scala | 2 +- .../sonar/scala/pr/github/GithubSpec.scala | 2 +- .../RecommendedQualityProfileSpec.scala | 2 +- ...calastyleScapegoatQualityProfileSpec.scala | 2 +- .../scalastyle/ScalastyleCheckerSpec.scala | 2 +- .../ScalastyleQualityProfileSpec.scala | 2 +- .../ScalastyleRulesRepositorySpec.scala | 2 +- .../scalastyle/ScalastyleSensorSpec.scala | 2 +- .../ScapegoatQualityProfileSpec.scala | 2 +- .../scapegoat/ScapegoatReportParserSpec.scala | 2 +- .../ScapegoatRulesRepositorySpec.scala | 2 +- .../scala/scapegoat/ScapegoatSensorSpec.scala | 2 +- .../scapegoat/ScoverageMeasuresSpec.scala | 2 +- .../scoverage/ScoverageReportParserSpec.scala | 2 +- .../scala/scoverage/ScoverageSensorSpec.scala | 2 +- .../mwz/sonar/scala/sensor/MeasuresSpec.scala | 2 +- .../sonar/scala/sensor/ScalaSensorSpec.scala | 2 +- .../com/mwz/sonar/scala/util/LogSpec.scala | 2 +- .../com/mwz/sonar/scala/util/LoggerSpec.scala | 2 +- .../mwz/sonar/scala/util/PathUtilsSpec.scala | 2 +- .../scala/util/syntax/OptionalsSpec.scala | 2 +- .../scala/util/syntax/SonarConfigSpec.scala | 2 +- .../util/syntax/SonarFileSystemSpec.scala | 2 +- .../util/syntax/SonarSensorContextSpec.scala | 2 +- .../sonar/api/utils/log/SonarLogTester.scala | 2 +- 47 files changed, 57 insertions(+), 59 deletions(-) diff --git a/project/src/main/resources/ScapegoatInspections.scala b/project/src/main/resources/ScapegoatInspections.scala index c6b32c4a..d5ca16b4 100644 --- a/project/src/main/resources/ScapegoatInspections.scala +++ b/project/src/main/resources/ScapegoatInspections.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/project/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleInspections.scala b/project/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleInspections.scala index 6f1d240c..21702cdc 100644 --- a/project/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleInspections.scala +++ b/project/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleInspections.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/project/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleInspectionsGenerator.scala b/project/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleInspectionsGenerator.scala index 45a56d2d..b750cd43 100644 --- a/project/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleInspectionsGenerator.scala +++ b/project/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleInspectionsGenerator.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/project/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatInspectionsGenerator.scala b/project/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatInspectionsGenerator.scala index 8eba0e55..05b1b981 100644 --- a/project/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatInspectionsGenerator.scala +++ b/project/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatInspectionsGenerator.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published @@ -62,23 +62,21 @@ object ScapegoatInspectionsGenerator { /** Stringifies a list of scapegoat inspections */ def stringifyInspections(scapegoatInspections: Seq[(String, Inspection)]): Seq[String] = - scapegoatInspections map { - case (inspectionClassName, inspection) => - s"""ScapegoatInspection( - | id = "$inspectionClassName", - | name = "${inspection.text}", - | defaultLevel = Level.${inspection.defaultLevel}, - | description = "${inspection.description}", - | explanation = "${inspection.explanation}" - |)""".stripMargin + scapegoatInspections map { case (inspectionClassName, inspection) => + s"""ScapegoatInspection( + | id = "$inspectionClassName", + | name = "${inspection.text}", + | defaultLevel = Level.${inspection.defaultLevel}, + | description = "${inspection.description}", + | explanation = "${inspection.explanation}" + |)""".stripMargin } /** Fill the template file */ def fillTemplate(template: Source, stringified: Seq[String]): Tree = { val term: Term = stringified.toString.parse[Term].get - template.transform { - case q"val AllInspections: $tpe = $expr" => - q"val AllInspections: $tpe = $term" + template.transform { case q"val AllInspections: $tpe = $expr" => + q"val AllInspections: $tpe = $term" } } } diff --git a/project/src/test/scala/ScalastyleInspectionsGeneratorTest.scala b/project/src/test/scala/ScalastyleInspectionsGeneratorTest.scala index 7934388b..e53d3adf 100644 --- a/project/src/test/scala/ScalastyleInspectionsGeneratorTest.scala +++ b/project/src/test/scala/ScalastyleInspectionsGeneratorTest.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/project/src/test/scala/ScapegoatInspectionsGeneratorSpec.scala b/project/src/test/scala/ScapegoatInspectionsGeneratorSpec.scala index 9dcc62b8..2a6bf0da 100644 --- a/project/src/test/scala/ScapegoatInspectionsGeneratorSpec.scala +++ b/project/src/test/scala/ScapegoatInspectionsGeneratorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/EmptyLogger.scala b/src/test/scala/com/mwz/sonar/scala/EmptyLogger.scala index 4cc8b092..2a4fa5e8 100644 --- a/src/test/scala/com/mwz/sonar/scala/EmptyLogger.scala +++ b/src/test/scala/com/mwz/sonar/scala/EmptyLogger.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/GlobalConfigSpec.scala b/src/test/scala/com/mwz/sonar/scala/GlobalConfigSpec.scala index 01b77ae8..3ca81f49 100644 --- a/src/test/scala/com/mwz/sonar/scala/GlobalConfigSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/GlobalConfigSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala index 0c8616c9..2842bd22 100755 --- a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/ScalaSpec.scala b/src/test/scala/com/mwz/sonar/scala/ScalaSpec.scala index 5c065e3c..977356ce 100644 --- a/src/test/scala/com/mwz/sonar/scala/ScalaSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/ScalaSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/SensorContextMatchers.scala b/src/test/scala/com/mwz/sonar/scala/SensorContextMatchers.scala index 8384c85b..bb5dc39c 100644 --- a/src/test/scala/com/mwz/sonar/scala/SensorContextMatchers.scala +++ b/src/test/scala/com/mwz/sonar/scala/SensorContextMatchers.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/fixtures.scala b/src/test/scala/com/mwz/sonar/scala/fixtures.scala index 6880d0b1..d27c9f1a 100644 --- a/src/test/scala/com/mwz/sonar/scala/fixtures.scala +++ b/src/test/scala/com/mwz/sonar/scala/fixtures.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/junit/JUnitReportParserSpec.scala b/src/test/scala/com/mwz/sonar/scala/junit/JUnitReportParserSpec.scala index 0d8931c0..02c7be3b 100644 --- a/src/test/scala/com/mwz/sonar/scala/junit/JUnitReportParserSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/junit/JUnitReportParserSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/junit/JUnitSensorSpec.scala b/src/test/scala/com/mwz/sonar/scala/junit/JUnitSensorSpec.scala index d7c0b97d..e8742be5 100644 --- a/src/test/scala/com/mwz/sonar/scala/junit/JUnitSensorSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/junit/JUnitSensorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesReposotorySpec.scala b/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesReposotorySpec.scala index 112a96c6..edb09713 100644 --- a/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesReposotorySpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesReposotorySpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesSpec.scala b/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesSpec.scala index 335e72ec..ab975cf9 100644 --- a/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesSpec.scala b/src/test/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesSpec.scala index c9058be7..c835f0e1 100644 --- a/src/test/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/pr/Generators.scala b/src/test/scala/com/mwz/sonar/scala/pr/Generators.scala index 218b3a0a..7b9ea218 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/Generators.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/Generators.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/pr/GithubPrReviewJobSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/GithubPrReviewJobSpec.scala index 22076f6e..89942bd0 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/GithubPrReviewJobSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/GithubPrReviewJobSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/pr/GlobalIssuesSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/GlobalIssuesSpec.scala index 7dd5cf09..fd7fec41 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/GlobalIssuesSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/GlobalIssuesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/pr/MarkdownSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/MarkdownSpec.scala index d2a073c6..fc072f57 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/MarkdownSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/MarkdownSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/pr/PatchSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/PatchSpec.scala index 60fac960..d153de0f 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/PatchSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/PatchSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/pr/ReviewStatusSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/ReviewStatusSpec.scala index f4b3dad2..7f9dffc1 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/ReviewStatusSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/ReviewStatusSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala b/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala index 0172cb58..5ae7bb68 100644 --- a/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/pr/github/GithubSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfileSpec.scala b/src/test/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfileSpec.scala index bdea2de3..f24f3b8e 100644 --- a/src/test/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfileSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfileSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfileSpec.scala b/src/test/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfileSpec.scala index 09999dd4..8dd559d3 100644 --- a/src/test/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfileSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfileSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleCheckerSpec.scala b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleCheckerSpec.scala index a084365f..a9d89195 100644 --- a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleCheckerSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleCheckerSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfileSpec.scala b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfileSpec.scala index 22421582..25230861 100644 --- a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfileSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfileSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepositorySpec.scala b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepositorySpec.scala index d721d2c6..89da45c9 100644 --- a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepositorySpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepositorySpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensorSpec.scala b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensorSpec.scala index 20b67b93..d5cfc2f4 100644 --- a/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensorSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfileSpec.scala b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfileSpec.scala index b6f896d6..cb3fd6c5 100644 --- a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfileSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfileSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParserSpec.scala b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParserSpec.scala index 85c4413d..b96ef3e9 100644 --- a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParserSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParserSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepositorySpec.scala b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepositorySpec.scala index cc159afc..178f0c51 100644 --- a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepositorySpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepositorySpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensorSpec.scala b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensorSpec.scala index c8579b9a..4f8aee34 100644 --- a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensorSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScoverageMeasuresSpec.scala b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScoverageMeasuresSpec.scala index 3c887d20..b65241ba 100644 --- a/src/test/scala/com/mwz/sonar/scala/scapegoat/ScoverageMeasuresSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scapegoat/ScoverageMeasuresSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParserSpec.scala b/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParserSpec.scala index e55fc01d..21095518 100644 --- a/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParserSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParserSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageSensorSpec.scala b/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageSensorSpec.scala index 2baacb5a..35531395 100644 --- a/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageSensorSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/scoverage/ScoverageSensorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/sensor/MeasuresSpec.scala b/src/test/scala/com/mwz/sonar/scala/sensor/MeasuresSpec.scala index 244b745f..7582fa24 100644 --- a/src/test/scala/com/mwz/sonar/scala/sensor/MeasuresSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/sensor/MeasuresSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/sensor/ScalaSensorSpec.scala b/src/test/scala/com/mwz/sonar/scala/sensor/ScalaSensorSpec.scala index 6007e8c3..7aae0e75 100644 --- a/src/test/scala/com/mwz/sonar/scala/sensor/ScalaSensorSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/sensor/ScalaSensorSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/util/LogSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/LogSpec.scala index c6ff8208..d40cecac 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/LogSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/LogSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/util/LoggerSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/LoggerSpec.scala index 0687955a..e1f0f592 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/LoggerSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/LoggerSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/util/PathUtilsSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/PathUtilsSpec.scala index 418b17c3..e3da0a0a 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/PathUtilsSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/PathUtilsSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/util/syntax/OptionalsSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/syntax/OptionalsSpec.scala index 54d02bb9..6a623b94 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/syntax/OptionalsSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/syntax/OptionalsSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarConfigSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarConfigSpec.scala index 8483e1e8..adf52dca 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarConfigSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarConfigSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystemSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystemSpec.scala index b1efef9d..1b54f5a8 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystemSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystemSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContextSpec.scala b/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContextSpec.scala index f3fef115..094b2e29 100644 --- a/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContextSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContextSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/org/sonar/api/utils/log/SonarLogTester.scala b/src/test/scala/org/sonar/api/utils/log/SonarLogTester.scala index 69cf9ec1..d1173a8c 100644 --- a/src/test/scala/org/sonar/api/utils/log/SonarLogTester.scala +++ b/src/test/scala/org/sonar/api/utils/log/SonarLogTester.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published From 1ab816aeaef1b4af951746293bf7be582e0df6db Mon Sep 17 00:00:00 2001 From: Mark de Jong Date: Sat, 7 May 2022 20:07:22 +0100 Subject: [PATCH 141/142] Bump to Sonar 9.4.0.54424 (#831) Co-authored-by: Mark --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- build.sbt | 4 ++-- src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala | 2 +- src/main/scala/com/mwz/sonar/scala/Metadata.scala | 2 +- src/main/scala/com/mwz/sonar/scala/ScalaPlugin.scala | 2 +- src/main/scala/com/mwz/sonar/scala/junit/JUnitReport.scala | 2 +- .../scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala | 2 +- src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala | 2 +- src/main/scala/com/mwz/sonar/scala/metadata/model.scala | 2 +- .../mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala | 2 +- .../scala/metadata/scalastyle/ScalastyleRulesRepository.scala | 2 +- .../mwz/sonar/scala/metadata/scapegoat/ScapegoatRules.scala | 2 +- .../scala/metadata/scapegoat/ScapegoatRulesRepository.scala | 2 +- src/main/scala/com/mwz/sonar/scala/package.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/GlobalIssues.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/github/Codec.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/github/Github.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/github/entities.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/model.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/package.scala | 2 +- src/main/scala/com/mwz/sonar/scala/pr/patch.scala | 2 +- .../scala/com/mwz/sonar/scala/qualityprofiles/Overrides.scala | 2 +- .../scala/qualityprofiles/RecommendedQualityProfile.scala | 2 +- .../qualityprofiles/ScalastyleScapegoatQualityProfile.scala | 2 +- .../com/mwz/sonar/scala/scalastyle/ScalastyleChecker.scala | 2 +- .../mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala | 2 +- .../sonar/scala/scalastyle/ScalastyleRulesRepository.scala | 2 +- .../com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala | 2 +- .../scala/com/mwz/sonar/scala/scapegoat/ScapegoatIssue.scala | 2 +- .../mwz/sonar/scala/scapegoat/ScapegoatQualityProfile.scala | 2 +- .../com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala | 2 +- .../mwz/sonar/scala/scapegoat/ScapegoatRulesRepository.scala | 2 +- .../scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala | 2 +- .../com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala | 2 +- .../com/mwz/sonar/scala/scoverage/ScoverageMetrics.scala | 2 +- .../com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala | 2 +- .../scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala | 2 +- src/main/scala/com/mwz/sonar/scala/scoverage/package.scala | 2 +- src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala | 2 +- src/main/scala/com/mwz/sonar/scala/sensor/ScalaSensor.scala | 2 +- src/main/scala/com/mwz/sonar/scala/util/Log.scala | 2 +- src/main/scala/com/mwz/sonar/scala/util/Logger.scala | 2 +- src/main/scala/com/mwz/sonar/scala/util/PathUtils.scala | 2 +- .../scala/com/mwz/sonar/scala/util/syntax/Optionals.scala | 2 +- .../scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala | 2 +- .../com/mwz/sonar/scala/util/syntax/SonarFileSystem.scala | 2 +- .../com/mwz/sonar/scala/util/syntax/SonarSensorContext.scala | 2 +- src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala | 2 +- 50 files changed, 51 insertions(+), 51 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7bbffcdc..06ba5717 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: - run: git fetch --prune --unshallow - uses: olafurpg/setup-scala@v10 with: - java-version: adopt@1.8 + java-version: adopt@1.11 - uses: actions/cache@v1 with: path: ~/.ivy2/cache diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 52e3abba..c329dc82 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v2 - uses: olafurpg/setup-scala@v10 with: - java-version: adopt@1.8 + java-version: adopt@1.11 - uses: actions/cache@v1 with: path: ~/.ivy2/cache diff --git a/build.sbt b/build.sbt index 0a68b40a..0903a0ae 100644 --- a/build.sbt +++ b/build.sbt @@ -48,7 +48,7 @@ scalacOptions ++= Seq( "-Yrangepos" ) scalacOptions -= "-Xfatal-warnings" -javacOptions := Seq("-Xlint:deprecation") +javacOptions := Seq("-Xlint:deprecation", "-source", "11", "-target", "11") cancelable in Global := true scalafmtOnCompile in ThisBuild := sys.env @@ -67,7 +67,7 @@ sourceGenerators in Compile ++= Seq( ) // Lib dependencies -val sonarVersion = "8.9.0.43852" +val sonarVersion = "9.4.0.54424" val circe = "0.13.0" val http4s = "0.21.23" libraryDependencies ++= List( diff --git a/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala b/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala index 57d32bc9..ae035b45 100644 --- a/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala +++ b/src/main/scala/com/mwz/sonar/scala/GlobalConfig.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/Metadata.scala b/src/main/scala/com/mwz/sonar/scala/Metadata.scala index f08566da..667ff11b 100644 --- a/src/main/scala/com/mwz/sonar/scala/Metadata.scala +++ b/src/main/scala/com/mwz/sonar/scala/Metadata.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/ScalaPlugin.scala b/src/main/scala/com/mwz/sonar/scala/ScalaPlugin.scala index 6bf690a7..ccfaea2f 100644 --- a/src/main/scala/com/mwz/sonar/scala/ScalaPlugin.scala +++ b/src/main/scala/com/mwz/sonar/scala/ScalaPlugin.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/junit/JUnitReport.scala b/src/main/scala/com/mwz/sonar/scala/junit/JUnitReport.scala index 07b08d34..f2845785 100644 --- a/src/main/scala/com/mwz/sonar/scala/junit/JUnitReport.scala +++ b/src/main/scala/com/mwz/sonar/scala/junit/JUnitReport.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala b/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala index e84ac5f6..2618e0d7 100644 --- a/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala +++ b/src/main/scala/com/mwz/sonar/scala/junit/JUnitReportParser.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala b/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala index d9575055..52fba0f5 100644 --- a/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/junit/JUnitSensor.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/metadata/model.scala b/src/main/scala/com/mwz/sonar/scala/metadata/model.scala index 7b019abe..a0c0a5c4 100644 --- a/src/main/scala/com/mwz/sonar/scala/metadata/model.scala +++ b/src/main/scala/com/mwz/sonar/scala/metadata/model.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala b/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala index 579ebc67..562e3094 100644 --- a/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala +++ b/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRules.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesRepository.scala b/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesRepository.scala index 7e5cc17c..8f8a68d4 100644 --- a/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesRepository.scala +++ b/src/main/scala/com/mwz/sonar/scala/metadata/scalastyle/ScalastyleRulesRepository.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRules.scala b/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRules.scala index 3a4cf288..0c40d2e0 100644 --- a/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRules.scala +++ b/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRules.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesRepository.scala b/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesRepository.scala index deb69851..d36bb16b 100644 --- a/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesRepository.scala +++ b/src/main/scala/com/mwz/sonar/scala/metadata/scapegoat/ScapegoatRulesRepository.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/package.scala b/src/main/scala/com/mwz/sonar/scala/package.scala index 5049406f..868bc6c6 100644 --- a/src/main/scala/com/mwz/sonar/scala/package.scala +++ b/src/main/scala/com/mwz/sonar/scala/package.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala b/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala index ce42bcb6..c0043892 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/GithubPrReviewJob.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/GlobalIssues.scala b/src/main/scala/com/mwz/sonar/scala/pr/GlobalIssues.scala index 042ca8c0..8f0ba3a4 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/GlobalIssues.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/GlobalIssues.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/github/Codec.scala b/src/main/scala/com/mwz/sonar/scala/pr/github/Codec.scala index 099cac62..7b2c87e4 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/github/Codec.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/github/Codec.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/github/Github.scala b/src/main/scala/com/mwz/sonar/scala/pr/github/Github.scala index cbb53372..ac5e54c8 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/github/Github.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/github/Github.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/github/entities.scala b/src/main/scala/com/mwz/sonar/scala/pr/github/entities.scala index fb803ffb..6c7ecbbc 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/github/entities.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/github/entities.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/model.scala b/src/main/scala/com/mwz/sonar/scala/pr/model.scala index b93100dd..b3100180 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/model.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/model.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/package.scala b/src/main/scala/com/mwz/sonar/scala/pr/package.scala index 8b1426ce..d74d39a6 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/package.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/package.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/pr/patch.scala b/src/main/scala/com/mwz/sonar/scala/pr/patch.scala index 1b52a72f..22e49688 100644 --- a/src/main/scala/com/mwz/sonar/scala/pr/patch.scala +++ b/src/main/scala/com/mwz/sonar/scala/pr/patch.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/qualityprofiles/Overrides.scala b/src/main/scala/com/mwz/sonar/scala/qualityprofiles/Overrides.scala index 6144ecb3..7c442332 100644 --- a/src/main/scala/com/mwz/sonar/scala/qualityprofiles/Overrides.scala +++ b/src/main/scala/com/mwz/sonar/scala/qualityprofiles/Overrides.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfile.scala b/src/main/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfile.scala index cb79172a..b608b81f 100644 --- a/src/main/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfile.scala +++ b/src/main/scala/com/mwz/sonar/scala/qualityprofiles/RecommendedQualityProfile.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfile.scala b/src/main/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfile.scala index 6668e258..459c6910 100644 --- a/src/main/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfile.scala +++ b/src/main/scala/com/mwz/sonar/scala/qualityprofiles/ScalastyleScapegoatQualityProfile.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleChecker.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleChecker.scala index 8429b88c..938594cc 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleChecker.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleChecker.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala index efa78438..aea48d84 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleQualityProfile.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepository.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepository.scala index 66b78c2b..25fe15ea 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepository.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleRulesRepository.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala index 8796a432..499a4a38 100644 --- a/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/scalastyle/ScalastyleSensor.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatIssue.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatIssue.scala index 7b47f3ec..4b332758 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatIssue.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatIssue.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfile.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfile.scala index 63b5608d..cd8c6f21 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfile.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatQualityProfile.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala index 06e0205e..fa28a2aa 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatReportParser.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepository.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepository.scala index d30fe66e..01e9401a 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepository.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatRulesRepository.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala index fb160a5b..1dbdef29 100644 --- a/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/scapegoat/ScapegoatSensor.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala index 382405df..e09d23c8 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMeasures.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMetrics.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMetrics.scala index 926a1d34..b5062398 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMetrics.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageMetrics.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala index 2041930d..b5881b65 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageReportParser.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala index c7aa8c51..46409c62 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/ScoverageSensor.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/scoverage/package.scala b/src/main/scala/com/mwz/sonar/scala/scoverage/package.scala index b3434d64..c04d5c84 100644 --- a/src/main/scala/com/mwz/sonar/scala/scoverage/package.scala +++ b/src/main/scala/com/mwz/sonar/scala/scoverage/package.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala b/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala index e7d9bfc4..70e4c141 100644 --- a/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala +++ b/src/main/scala/com/mwz/sonar/scala/sensor/Measures.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/sensor/ScalaSensor.scala b/src/main/scala/com/mwz/sonar/scala/sensor/ScalaSensor.scala index 177ca75d..2b09ebb7 100644 --- a/src/main/scala/com/mwz/sonar/scala/sensor/ScalaSensor.scala +++ b/src/main/scala/com/mwz/sonar/scala/sensor/ScalaSensor.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/util/Log.scala b/src/main/scala/com/mwz/sonar/scala/util/Log.scala index 9c7d02cc..f705be88 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/Log.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/Log.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/util/Logger.scala b/src/main/scala/com/mwz/sonar/scala/util/Logger.scala index 3439eb1d..647e2d52 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/Logger.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/Logger.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/util/PathUtils.scala b/src/main/scala/com/mwz/sonar/scala/util/PathUtils.scala index fd4fad05..f3a03e59 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/PathUtils.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/PathUtils.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/util/syntax/Optionals.scala b/src/main/scala/com/mwz/sonar/scala/util/syntax/Optionals.scala index c64f4998..b5e32f53 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/syntax/Optionals.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/syntax/Optionals.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala index bb882c44..3766390a 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarConfig.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystem.scala b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystem.scala index da1b7c46..fc792b83 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystem.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarFileSystem.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContext.scala b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContext.scala index f41f5cf9..de6f3a7e 100644 --- a/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContext.scala +++ b/src/main/scala/com/mwz/sonar/scala/util/syntax/SonarSensorContext.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 All sonar-scala contributors + * Copyright (C) 2018-2022 All sonar-scala contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published diff --git a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala index 2842bd22..ec368f5d 100755 --- a/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala +++ b/src/test/scala/com/mwz/sonar/scala/ScalaPluginSpec.scala @@ -28,7 +28,7 @@ import org.sonar.api.utils.Version class ScalaPluginSpec extends AnyFlatSpec with Matchers { val runtime: SonarRuntime = SonarRuntimeImpl.forSonarQube( - Version.create(8, 9), + Version.create(9, 4), SonarQubeSide.SCANNER, SonarEdition.COMMUNITY ) From 8e6876b67cdbd78f835f238100474915544a76bb Mon Sep 17 00:00:00 2001 From: Michael Wizner Date: Tue, 10 May 2022 23:52:08 +0100 Subject: [PATCH 142/142] Update README --- README.md | 6 +++--- README.tpl.md | 2 +- vars.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 73a8147f..bb19a3cc 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ [![bintray-badge-lts-67]][bintray-lts-67] [![gitter-badge]][gitter] [sonatype]: - https://s01.oss.sonatype.org/content/repositories/releases/com/sonar-scala/sonar-scala_2.13/8.7.0/sonar-scala_2.13-8.7.0-assembly.jar -[sonatype-badge]: https://img.shields.io/badge/Download-8.7.0-blue.svg + https://s01.oss.sonatype.org/content/repositories/releases/com/sonar-scala/sonar-scala_2.13/9.0.0/sonar-scala_2.13-9.0.0-assembly.jar +[sonatype-badge]: https://img.shields.io/badge/Download-9.0.0-blue.svg [bintray-badge-lts]: https://img.shields.io/badge/Download-8.9.0_(for_SonarQube_8.9_LTS)-blue.svg [bintray-badge-lts-79]: @@ -30,7 +30,7 @@ sonar-scala is an independent SonarQube plugin, driven by and developed with :heart: by the [community](https://github.com/mwz/sonar-scala/graphs/contributors). -Intended for [SonarQube 8.7](https://www.sonarqube.org/sonarqube-8-7), +Intended for [SonarQube 9.4](https://www.sonarqube.org/sonarqube-9-4), [SonarQube 8.9 LTS](https://www.sonarqube.org/sonarqube-8-7), [SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts), [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts) and Scala diff --git a/README.tpl.md b/README.tpl.md index 708a038f..42f244f0 100644 --- a/README.tpl.md +++ b/README.tpl.md @@ -30,7 +30,7 @@ sonar-scala is an independent SonarQube plugin, driven by and developed with :heart: by the [community](https://github.com/mwz/sonar-scala/graphs/contributors). -Intended for [SonarQube 8.7](https://www.sonarqube.org/sonarqube-8-7), +Intended for [SonarQube 9.4](https://www.sonarqube.org/sonarqube-9-4), [SonarQube 8.9 LTS](https://www.sonarqube.org/sonarqube-8-7), [SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts), [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts) and Scala diff --git a/vars.json b/vars.json index f3cc6cd7..7524c5f5 100644 --- a/vars.json +++ b/vars.json @@ -1,5 +1,5 @@ { - "version": "8.7.0", + "version": "9.0.0", "ltsVersion": "8.9.0", "lts79Version": "7.9.0", "lts67Version": "6.8.0"