Skip to content

Commit

Permalink
feature: Bump scala seed, scala version and play-json
Browse files Browse the repository at this point in the history
  • Loading branch information
pedrocodacy committed Jun 11, 2019
1 parent 20f81ea commit 3e6f484
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name := """codacy-engine-jackson-linter"""

version := "1.0-SNAPSHOT"

val languageVersion = "2.11.8"
val languageVersion = "2.12.7"

scalaVersion := languageVersion

Expand All @@ -14,8 +14,8 @@ resolvers ++= Seq(
)

libraryDependencies ++= Seq(
"com.typesafe.play" %% "play-json" % "2.3.8",
"com.codacy" %% "codacy-engine-scala-seed" % "2.7.1",
"com.typesafe.play" %% "play-json" % "2.7.3",
"com.codacy" %% "codacy-engine-scala-seed" % "3.0.9",
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.6"
)

Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/codacy/Engine.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package codacy

import codacy.dockerApi.DockerEngine
import codacy.jsonLint.JsonLint
import com.codacy.tools.scala.seed.DockerEngine

object Engine extends DockerEngine(JsonLint)
object Engine extends DockerEngine(JsonLint)()
15 changes: 8 additions & 7 deletions src/main/scala/codacy/jsonLint/JsonLint.scala
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package codacy.jsonLint

import better.files.File
import codacy.docker.api.Pattern.Definition
import codacy.docker.api.Result.Issue
import codacy.docker.api.Source.Directory
import codacy.docker.api.Tool.Specification
import codacy.docker.api._
import com.codacy.plugins.api.{ErrorMessage, Options, Source}
import com.codacy.plugins.api.results.{Pattern, Result, Tool}
import com.codacy.plugins.api.results.Pattern.Definition
import com.codacy.plugins.api.results.Result.Issue
import com.fasterxml.jackson.core.{JsonParseException, JsonParser}
import com.fasterxml.jackson.databind.ObjectMapper

Expand Down Expand Up @@ -40,8 +39,10 @@ object JsonLint extends Tool {
objectMapper
}

override def apply(source: Directory, configuration: Option[List[Definition]], files: Option[Set[Source.File]])
(implicit specification: Specification): Try[List[Result]] = {
def apply(source: Source.Directory,
configuration: Option[List[Pattern.Definition]],
files: Option[Set[Source.File]],
options: Map[Options.Key, Options.Value])(implicit specification: Tool.Specification): Try[List[Result]] = {

val filesList = files.map(_.map(file => File(file.path))).getOrElse(File(source.path).listRecursively.toSet)

Expand Down

0 comments on commit 3e6f484

Please sign in to comment.