Merge pull request #289 from codacy/bump-plugins-use-tools-list

bump: Bump codacy-plugins, depend on separate tools-list artifact

Author: lolgab

core/src/main/scala/com/codacy/analysis/core/tools/DuplicationTool.scala

@@ -8,8 +8,8 @@ import com.codacy.plugins.api.duplication.DuplicationTool.CodacyConfiguration
 import com.codacy.plugins.api.languages.Language
 import com.codacy.plugins.api
 import com.codacy.plugins.duplication.traits
+import com.codacy.plugins.duplication.utils.DuplicationTools
 import com.codacy.plugins.runners.{BinaryDockerRunner, DockerRunner}
-import com.codacy.plugins.utils.PluginHelper
 import org.log4s.getLogger
 
 import scala.concurrent.duration._
@@ -67,7 +67,7 @@ object DuplicationToolCollector {
 
   private val logger: org.log4s.Logger = getLogger
 
-  private val availableTools: List[traits.DuplicationTool] = PluginHelper.dockerDuplicationPlugins
+  private val availableTools: List[traits.DuplicationTool] = DuplicationTools.list
 
   def fromLanguages(languages: Set[Language]): Set[DuplicationTool] = {
     languages.flatMap { lang =>

core/src/main/scala/com/codacy/analysis/core/tools/MetricsTool.scala

@@ -10,8 +10,8 @@ import com.codacy.plugins.api.languages.Language
 import com.codacy.plugins.api.metrics.MetricsTool.CodacyConfiguration
 import com.codacy.plugins.metrics.traits
 import com.codacy.plugins.metrics.traits.{MetricsRequest, MetricsRunner}
+import com.codacy.plugins.metrics.utils.MetricsTools
 import com.codacy.plugins.runners.{BinaryDockerRunner, DockerRunner}
-import com.codacy.plugins.utils.PluginHelper
 import org.log4s.getLogger
 
 import scala.concurrent.duration.Duration
@@ -59,7 +59,7 @@ object MetricsToolCollector {
 
   private val logger: org.log4s.Logger = getLogger
 
-  private val availableTools = PluginHelper.dockerMetricsPlugins
+  private val availableTools = MetricsTools.list
 
   def fromLanguages(languages: Set[Language]): Set[MetricsTool] = {
     languages.flatMap { lang =>

core/src/main/scala/com/codacy/analysis/core/tools/Tool.scala

@@ -13,7 +13,8 @@ import com.codacy.plugins.api.results.Result
 import com.codacy.plugins.results.traits.{DockerTool, DockerToolDocumentation, ToolRunner}
 import com.codacy.plugins.results.{PatternRequest, PluginConfiguration, PluginRequest}
 import com.codacy.plugins.runners.{BinaryDockerRunner, DockerRunner}
-import com.codacy.plugins.utils.{BinaryDockerHelper, PluginHelper}
+import com.codacy.plugins.results.utils.ResultsTools
+import com.codacy.plugins.utils.BinaryDockerHelper
 import org.log4s.{Logger, getLogger}
 import play.api.libs.json.JsValue
 
@@ -124,7 +125,7 @@ class Tool(runner: ToolRunner, defaultRunTimeout: Duration)(private val plugin:
 
 object Tool {
 
-  val availableTools: List[DockerTool] = PluginHelper.dockerPlugins
+  val availableTools: List[DockerTool] = ResultsTools.list
 
   val allToolShortNames: Set[String] = availableTools.map(_.shortName).toSet
 

project/Dependencies.scala

@@ -2,7 +2,7 @@ import sbt._
 
 object Dependencies {
 
-  val codacyPluginsVersion = "19.0.10_play_2.7"
+  val codacyPluginsVersion = "20.0.0_play_2.7"
   val circeVersion = "0.12.3"
   val specs2Version = "4.8.1"
 
@@ -26,7 +26,8 @@ object Dependencies {
   lazy val caseApp = "com.github.alexarchambault" %% "case-app" % "1.2.0"
 
   val codacyPlugins =
-    Seq("com.codacy" %% "codacy-plugins", "com.codacy" %% "codacy-plugins-runner-binary").map(_ % codacyPluginsVersion)
+    Seq("codacy-plugins", "codacy-plugins-runner-binary", "codacy-plugins-tools-list").map(
+      "com.codacy" %% _ % codacyPluginsVersion)
 
   lazy val pluginsApi = "com.codacy" %% "codacy-plugins-api" % "4.0.2"