Update orb/plugins/scala

Author: zhamborova

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  codacy: codacy/base@10.11.0
+  codacy: codacy/base@12.2.0
   slack: circleci/[email protected]
 
 references:
@@ -186,8 +186,7 @@ workflows:
           name: lint
           install_sbt_version: 1.8.2
           cmd: |
-            sbt "scalafmtCheckAll;scalafmtSbtCheck;scapegoat;scalafixEnable;scalafix --test"
-          cache_prefix: *cache_prefix
+            sbt "scalafmtCheckAll;scalafmtSbtCheck;scalafixEnable;scalafix --test"
           requires:
             - compile
       - codacy/sbt:

build.sbt

@@ -19,9 +19,7 @@ val assemblyCommon = Seq(
 inThisBuild(
   Seq(
     scalaVersion := Common.scalaVersionNumber,
-    scalaBinaryVersion := Common.scalaBinaryVersionNumber,
-    scapegoatDisabledInspections := Seq(),
-    scapegoatVersion := "1.4.6"))
+    scalaBinaryVersion := Common.scalaBinaryVersionNumber))
 
 val sonatypeInformation = Seq(
   startYear := Some(2018),
@@ -38,6 +36,7 @@ lazy val codacyAnalysisCore = project
   .settings(name := "codacy-analysis-core")
   .settings(coverageExcludedPackages := "<empty>;com\\.codacy\\..*Error.*")
   .settings(Common.genericSettings)
+  .settings(Common.scapegoatSettings)
   .settings(
     // App Dependencies
     libraryDependencies ++= Seq(
@@ -87,6 +86,7 @@ lazy val codacyAnalysisModels = project
     crossScalaVersions := Common.supportedScalaVersions,
     name := "codacy-analysis-cli-model",
     Common.genericSettings,
+    Common.scapegoatSettings,
     libraryDependencies ++=
       Dependencies.circe ++ Seq(Dependencies.pluginsApi) ++ Dependencies.specs2,
     description := "Library with analysis models")

project/Common.scala

@@ -11,12 +11,23 @@ object Common {
 
   private val defaultDockerInstallationPath = "/opt/codacy"
   val scalaBinaryVersionNumber = "2.12"
-  val scalaVersionNumber = s"$scalaBinaryVersionNumber.12"
+  val scalaVersionNumber = s"$scalaBinaryVersionNumber.19"
 
   val scala213BinaryVersionNumber = "2.13"
-  val scala213VersionNumber = s"$scala213BinaryVersionNumber.3"
+  val scala213VersionNumber = s"$scala213BinaryVersionNumber.14"
   lazy val supportedScalaVersions = List(Common.scalaVersionNumber, Common.scala213VersionNumber)
 
+  val scapegoatSettings = Seq(
+    libraryDependencies += compilerPlugin(
+      "com.sksamuel.scapegoat" % s"scalac-scapegoat-plugin_${scalaVersion.value}" % (scalaVersion.value match {
+        case v if v.startsWith("2.12") => "3.1.9"
+        case v if v.startsWith("2.13") => "3.1.2"
+        case _                         => "3.1.9"
+      })),
+    scalacOptions ++= Seq(
+      s"-P:scapegoat:dataDir:${crossTarget.value}/scapegoat-report",
+      "-P:scapegoat:reports:xml:html:markdown"))
+
   val genericSettings = Seq(
     scalacOptions ++= Common.compilerFlags(scalaVersion.value),
     Test / scalacOptions += "-Yrangepos",

project/Dependencies.scala

@@ -6,7 +6,7 @@ object Dependencies {
   val circeVersion = "0.12.3"
   val specs2Version = "4.8.1"
   val codacyApiVersion = "26.20.0"
-  val silencerVersion = "1.7.0"
+  val silencerVersion = "1.7.19"
 
   lazy val circe = List(
     "io.circe" %% "circe-core" % circeVersion,
@@ -42,8 +42,8 @@ object Dependencies {
 
   lazy val typesafeConfig = "com.typesafe" % "config" % "1.4.0"
 
-  val akkaVersion = "2.5.26"
-  val akkaHttpVersion = "10.1.9"
+  val akkaVersion = "2.6.20"
+  val akkaHttpVersion = "10.2.10"
 
   val akka =
     Seq(

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.10.5

project/plugins.sbt

@@ -1,14 +1,16 @@
 addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "25.2.4")
 
 // Coverage
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.6")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.0")
 
 // Static Analysis
-addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.0")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.21")
+// Commented out due to Scala version conflicts, it kept trying to fetch non existing
+///scalac-scapegoat-plugin_2.12.15/3.1.9
+// addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.13")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")
 
 // Dependencies
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
 
 // Swagger code generation
 addSbtPlugin("com.twilio" % "sbt-guardrail" % "0.59.0")