Skip to content
This repository has been archived by the owner on Feb 19, 2020. It is now read-only.

Commit

Permalink
update coverage parser and remove unnecessary dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
pedrocodacy committed Nov 21, 2018
1 parent 21875a0 commit dcfd678
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 17 deletions.
4 changes: 1 addition & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ resolvers ++= Seq(
)

libraryDependencies ++= Seq(
codacyScalaApi,
coverageParser,
raptureJsonCirce,
Codacy.coverageParser,
javaxActivation
)

Expand Down
17 changes: 14 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,20 @@ import sbt._

object Dependencies {

val codacyScalaApi = "com.codacy" %% "codacy-api-scala" % "3.0.7"
val coverageParser = "com.codacy" %% "coverage-parser" % "2.0.7"
val raptureJsonCirce = "com.propensive" %% "rapture-json-circe" % "2.0.0-M8" exclude("org.spire-math", "jawn-parser_2.11")
object Codacy {
val coverageParser = "com.codacy" %% "coverage-parser" % "1.1.1-SNAPSHOT"
}
val javaxActivation = "com.sun.activation" % "javax.activation" % "1.2.0"

/*
def circe(version: String): Seq[ModuleID] = {
Seq(
"io.circe" %% "circe-core" % version,
"io.circe" %% "circe-parser" % version,
"io.circe" %% "circe-generic" % version
)
}
*/

val playJson = "com.typesafe.play" %% "play-json" % "2.7.0-M1"
}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.16
sbt.version=1.2.3
2 changes: 2 additions & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ resolvers ++= Seq(
Classpaths.sbtPluginReleases
)

/*
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.8")
*/
13 changes: 3 additions & 10 deletions src/main/scala/com/codacy/CodacyCoveragePlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,13 @@ import java.io.File
import com.codacy.api.client.{CodacyClient, FailedResponse, SuccessfulResponse}
import com.codacy.api.helpers.FileHelper
import com.codacy.api.service.CoverageServices
import com.codacy.api.{CoverageFileReport, Language}
import com.codacy.parsers.implementation.CoberturaParser
import rapture.json.{Json, _}
import com.codacy.plugins.api.languages.Languages.Scala
import sbt.Keys._
import sbt._

object CodacyCoveragePlugin extends AutoPlugin {

implicit val (ast, stringParser, jsonSerializer) = {
import rapture.json.jsonBackends.circe._
(implicitJsonAst, implicitJsonStringParser, circeJValueSerializer)
}

private implicit lazy val ser = implicitly[Serializer[CoverageFileReport, Json]]

object AutoImport {
val codacyCoverage = taskKey[Unit]("Upload coverage reports to Codacy.")
Expand Down Expand Up @@ -67,7 +60,7 @@ object CodacyCoveragePlugin extends AutoPlugin {
FileHelper.withTokenAndCommit(codacyToken, commitUUIDOpt) {
case (projectToken, commitUUID) =>

val reader = new CoberturaParser(Language.Scala, rootProjectDir, coberturaFile)
val reader = new CoberturaParser(Scala, rootProjectDir, coberturaFile)
val report = reader.generateReport()

FileHelper.writeJsonToFile(codacyCoverageFile, report)
Expand All @@ -77,7 +70,7 @@ object CodacyCoveragePlugin extends AutoPlugin {

logger.info(s"Uploading coverage data...")

coverageServices.sendReport(commitUUID, Language.Scala.toString, report) match {
coverageServices.sendReport(commitUUID, Scala.toString, report) match {
case FailedResponse(error) =>
sys.error(s"Failed to upload data. Reason: $error")
state.exit(ok = false)
Expand Down

0 comments on commit dcfd678

Please sign in to comment.