updated to jacoco 0.6.4

sbt · Dec 14, 2013 · 003c9f6 · 003c9f6
1 parent bf784e8
commit 003c9f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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._