From 003c9f66230b80051dc6858bb79e55e0277269e4 Mon Sep 17 00:00:00 2001 From: Joachim Hofer Date: Sat, 14 Dec 2013 13:47:09 +0100 Subject: [PATCH] updated to jacoco 0.6.4 --- build.sbt | 4 ++-- src/main/scala/de/johoop/jacoco4sbt/Merging.scala | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 3fbb5f90..49029fcc 100755 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ resolvers += "Sonatype Release" at "https://oss.sonatype.org/content/repositorie scalaVersion := "2.10.3" libraryDependencies ++= Seq( - "org.jacoco" % "org.jacoco.core" % "0.6.3.201306030806" artifacts(Artifact("org.jacoco.core", "jar", "jar")), - "org.jacoco" % "org.jacoco.report" % "0.6.3.201306030806" artifacts(Artifact("org.jacoco.report", "jar", "jar"))) + "org.jacoco" % "org.jacoco.core" % "0.6.4.201312101107" artifacts(Artifact("org.jacoco.core", "jar", "jar")), + "org.jacoco" % "org.jacoco.report" % "0.6.4.201312101107" artifacts(Artifact("org.jacoco.report", "jar", "jar"))) scalacOptions ++= Seq("-unchecked", "-deprecation", "-language:_") diff --git a/src/main/scala/de/johoop/jacoco4sbt/Merging.scala b/src/main/scala/de/johoop/jacoco4sbt/Merging.scala index 7ee9b1fb..8e1f6d73 100644 --- a/src/main/scala/de/johoop/jacoco4sbt/Merging.scala +++ b/src/main/scala/de/johoop/jacoco4sbt/Merging.scala @@ -14,7 +14,8 @@ package de.johoop.jacoco4sbt import sbt._ trait Merging extends JaCoCoRuntime { - import org.jacoco.core.data.{ExecutionDataWriter, ExecFileLoader} + import org.jacoco.core.data.ExecutionDataWriter + import org.jacoco.core.tools.ExecFileLoader import java.io._ import sbt.Keys._