Merge pull request #239 from scoverage/scala-2-13-0-M5

Add Scala 2.13.0-M5 support

Author: gslowikowski

.travis.yml

@@ -9,8 +9,8 @@ jdk:
 scala:
   - 2.10.7
   - 2.11.12
-  - 2.12.6
-  - 2.13.0-M4
+  - 2.12.7
+  - 2.13.0-M5
 
 before_cache:
   - find "$HOME/.sbt/" -name '*.lock' -print0 | xargs -0 rm

build.sbt

@@ -7,12 +7,12 @@ import sbtcrossproject.CrossType
 
 val Org = "org.scoverage"
 val MockitoVersion = "2.19.0"
-val ScalatestVersion = "3.0.6-SNAP1"
+val ScalatestVersion = "3.0.6-SNAP4"
 
 val appSettings = Seq(
     organization := Org,
-    scalaVersion := "2.12.6",
-    crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.6", "2.13.0-M4"),
+    scalaVersion := "2.12.7",
+    crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.7", "2.13.0-M5"),
     fork in Test := false,
     publishMavenStyle := true,
     publishArtifact in Test := false,
@@ -91,7 +91,7 @@ lazy val plugin = Project("scalac-scoverage-plugin", file("scalac-scoverage-plug
   )).settings(libraryDependencies ++= {
     CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((2, scalaMajor)) if scalaMajor > 10 => Seq(
-        "org.scala-lang.modules" %% "scala-xml" % "1.1.0",
+        "org.scala-lang.modules" %% "scala-xml" % "1.1.1",
         "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0" % "test"
       )
       case _ => Seq(

project/plugins.sbt

@@ -4,6 +4,6 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
 
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.7")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.24")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
 
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")

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

@@ -47,7 +47,7 @@ class CodeGrid(mFile: MeasuredFile, sourceEncoding: Option[String]) {
     val code = lines map (line => {
       var style = cellStyle(NoData)
       val sb = new StringBuilder
-      sb append lineNumber + " "
+      sb append lineNumber append " "
       lineNumber = lineNumber + 1
       sb append spanStart(NoData)
       line.map(cell => {

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

@@ -14,7 +14,7 @@ import scala.xml.XML
 class CoberturaXmlWriterTest extends FunSuite with BeforeAndAfter with OneInstancePerTest {
 
   def tempDir(): File = {
-    val dir = new File(IOUtils.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

@@ -47,18 +47,18 @@ class IOUtilsTest extends FreeSpec with MockitoSugar with OneInstancePerTest wit
       val base = new File(IOUtils.getTempDirectory, UUID.randomUUID.toString)
       base.mkdir() shouldBe true
 
-      val file1 = new File(base + "/" + Constants.XMLReportFilename)
+      val file1 = new File(base, Constants.XMLReportFilename)
       val writer1 = new FileWriter(file1)
       writer1.write("1\n3\n5\n\n\n7\n")
       writer1.close()
 
-      val file2 = new File(base + "/" + UUID.randomUUID + "/" + Constants.XMLReportFilename)
+      val file2 = new File(base, UUID.randomUUID.toString + "/" + Constants.XMLReportFilename)
       file2.getParentFile.mkdir()
       val writer2 = new FileWriter(file2)
       writer2.write("2\n4\n6\n\n8\n")
       writer2.close()
 
-      val file3 = new File(file2.getParent + "/" + UUID.randomUUID + "/" + Constants.XMLReportFilename)
+      val file3 = new File(file2.getParentFile, UUID.randomUUID.toString + "/" + Constants.XMLReportFilename)
       file3.getParentFile.mkdir()
       val writer3 = new FileWriter(file3)
       writer3.write("11\n20\n30\n\n44\n")

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

@@ -35,7 +35,7 @@ class ScoverageHtmlWriterTest extends FunSuite {
     "scala.Predef.println", "Apply", false, 0)
 
   def createTemporaryDir(): File = {
-    val dir = new File(IOUtils.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/SerializerTest.scala

@@ -96,7 +96,7 @@ class SerializerTest extends FunSuite with MockitoSugar with OneInstancePerTest
         |false
         |def test : String
         |\f
-        |""".stripMargin.split("\n").toIterator
+        |""".stripMargin.split("\n").iterator
     val statements = List(Statement(
       Location("org.scoverage", "test", "org.scoverage.test", ClassType.Trait, "mymethod", "mypath"),
       14, 100, 200, 4, "def test : String", "test", "DefDef", true, 1