Removed dependencies on commons-io

Author: sksamuel

project/Scoverage.scala

@@ -76,9 +76,8 @@ object Scoverage extends Build {
     .settings(name := "scalac-scoverage-plugin")
     .settings(appSettings: _*)
     .settings(libraryDependencies ++= Seq(
-    "commons-io" % "commons-io" % "2.4",
-    "org.scala-lang" % "scala-reflect" % scalaVersion.value,
-    "org.scala-lang" % "scala-compiler" % scalaVersion.value,
+    "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided",
+    "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
     "org.joda" % "joda-convert" % "1.6" % "test",
     "joda-time" % "joda-time" % "2.3" % "test",
     "com.typesafe.scala-logging" %% "scala-logging-slf4j" % "2.1.2" % "test"

scalac-scoverage-plugin/src/main/scala/scoverage/IOUtils.scala

@@ -10,6 +10,9 @@ import scala.io.Source
 /** @author Stephen Samuel */
 object IOUtils {
 
+  def getTempDirectory: File = new File(getTempPath)
+  def getTempPath: String = System.getProperty("java.io.tmpdir")
+
   def readStreamAsString(in: InputStream): String = Source.fromInputStream(in).mkString
 
   private val UnixSeperator: Char = '/'

scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala

@@ -2,8 +2,7 @@ package scoverage.report
 
 import java.io.File
 
-import _root_.scoverage.{Coverage, MeasuredClass, MeasuredMethod, MeasuredPackage}
-import org.apache.commons.io.FileUtils
+import scoverage._
 
 import scala.xml.Node
 
@@ -13,7 +12,7 @@ class CoberturaXmlWriter(baseDir: File, outputDir: File) {
   def format(double: Double): String = "%.2f".format(double)
 
   def write(coverage: Coverage): Unit = {
-    FileUtils.write(new File(outputDir.getAbsolutePath + "/cobertura.xml"),
+    IOUtils.writeToFile(new File(outputDir.getAbsolutePath + "/cobertura.xml"),
       "<?xml version=\"1.0\"?>\n<!DOCTYPE coverage SYSTEM \"http://cobertura.sourceforge.net/xml/coverage-04.dtd\">\n" +
         xml(coverage))
   }

scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageXmlWriter.scala

@@ -3,7 +3,6 @@ package scoverage.report
 import java.io.File
 
 import _root_.scoverage._
-import org.apache.commons.io.FileUtils
 
 import scala.xml.{Node, PrettyPrinter}
 
@@ -15,7 +14,7 @@ class ScoverageXmlWriter(sourceDir: File, outputDir: File, debug: Boolean) {
       case true => new File(outputDir.getAbsolutePath + "/scoverage-debug.xml")
       case false => new File(outputDir.getAbsolutePath + "/" + Constants.XMLReportFilename)
     }
-    FileUtils.write(file, new PrettyPrinter(120, 4).format(xml(coverage)))
+    IOUtils.writeToFile(file, new PrettyPrinter(120, 4).format(xml(coverage)))
   }
 
   def statement(stmt: Statement): Node = {

scalac-scoverage-plugin/src/main/scala/scoverage/report/SourceHighlighter.scala

@@ -1,18 +1,16 @@
 package scoverage.report
 
-import java.io.{File, FileInputStream}
-
 import _root_.scoverage.MeasuredFile
-import org.apache.commons.io.IOUtils
 
+import scala.io.Source
 import scala.xml.{Node, Unparsed}
 
 /** @author Stephen Samuel */
 class SourceHighlighter {
 
   val sep = System.getProperty("line.separator")
 
-  def source(mfile: MeasuredFile) = IOUtils.toString(new FileInputStream(new File(mfile.source)), "UTF-8")
+  def source(mfile: MeasuredFile) = Source.fromFile(mfile.source).mkString
 
   def print(mfile: MeasuredFile): Node = {
     val s = source(mfile)

scalac-scoverage-plugin/src/test/scala/scoverage/CoberturaXmlWriterTest.scala

@@ -4,7 +4,6 @@ import java.io.File
 import java.util.UUID
 import javax.xml.parsers.DocumentBuilderFactory
 
-import org.apache.commons.io.FileUtils
 import org.scalatest.{BeforeAndAfter, FunSuite, OneInstancePerTest}
 import org.xml.sax.{ErrorHandler, SAXParseException}
 import scoverage.report.CoberturaXmlWriter
@@ -15,7 +14,7 @@ import scala.xml.XML
 class CoberturaXmlWriterTest extends FunSuite with BeforeAndAfter with OneInstancePerTest {
 
   def tempDir(): File = {
-    val dir = new File(FileUtils.getTempDirectory, UUID.randomUUID().toString)
+    val dir = new File(IOUtils.getTempDirectory, UUID.randomUUID().toString)
     dir.mkdirs()
     dir.deleteOnExit()
     dir

scalac-scoverage-plugin/src/test/scala/scoverage/IOUtilsTest.scala

@@ -3,9 +3,8 @@ package scoverage
 import java.io.{File, FileWriter}
 import java.util.UUID
 
-import org.apache.commons.io.FileUtils
 import org.scalatest.mock.MockitoSugar
-import org.scalatest.{Matchers, FreeSpec, OneInstancePerTest}
+import org.scalatest.{FreeSpec, Matchers, OneInstancePerTest}
 
 /** @author Stephen Samuel */
 class IOUtilsTest extends FreeSpec with MockitoSugar with OneInstancePerTest with Matchers {
@@ -23,7 +22,7 @@ class IOUtilsTest extends FreeSpec with MockitoSugar with OneInstancePerTest wit
     }
     "should parse multiple measurement files" in {
       // clean up any existing measurement files
-      for ( file <- IOUtils.findMeasurementFiles(FileUtils.getTempDirectoryPath) )
+      for ( file <- IOUtils.findMeasurementFiles(IOUtils.getTempDirectory) )
         file.delete()
 
       val file1 = File.createTempFile("scoverage.measurements.1", "txt")
@@ -45,7 +44,7 @@ class IOUtilsTest extends FreeSpec with MockitoSugar with OneInstancePerTest wit
     }
     "should deep search for report files" in {
       // create new folder to hold all our data
-      val base = new File(FileUtils.getTempDirectoryPath + "/" + UUID.randomUUID)
+      val base = new File(IOUtils.getTempDirectory, UUID.randomUUID.toString)
       base.mkdir() shouldBe true
 
       val file1 = new File(base + "/" + Constants.XMLReportFilename)

scalac-scoverage-plugin/src/test/scala/scoverage/LocationCompiler.scala

@@ -20,7 +20,7 @@ class LocationCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tools
 
   def writeCodeSnippetToTempFile(code: String): File = {
     val file = File.createTempFile("code_snippet", ".scala")
-    org.apache.commons.io.FileUtils.write(file, code)
+    IOUtils.writeToFile(file, code)
     file.deleteOnExit()
     file
   }

scalac-scoverage-plugin/src/test/scala/scoverage/compiler.scala

@@ -84,7 +84,7 @@ class ScoverageCompiler(settings: scala.tools.nsc.Settings, reporter: scala.tool
 
   def writeCodeSnippetToTempFile(code: String): File = {
     val file = File.createTempFile("scoverage_snippet", ".scala")
-    org.apache.commons.io.FileUtils.write(file, code)
+    IOUtils.writeToFile(file, code)
     file.deleteOnExit()
     file
   }