Skip to content

Commit 3a0fe27

Browse files
committed
#56 Escaping description
1 parent 04dce01 commit 3a0fe27

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

build.sbt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,33 @@ name := "scalac-scoverage-plugin"
44

55
organization := "org.scoverage"
66

7-
version := "0.99.7"
7+
version := "0.99.8"
88

99
scalacOptions := Seq("-unchecked", "-deprecation", "-feature", "-encoding", "utf8")
1010

1111
resolvers := ("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2") +: resolvers.value
1212

1313
javacOptions ++= Seq("-source", "1.6", "-target", "1.6")
1414

15-
scalaVersion := "2.11.1"
15+
scalaVersion := "2.11.2"
1616

17-
crossScalaVersions := Seq("2.10.4", "2.11.1", "2.9.3")
17+
crossScalaVersions := Seq("2.10.4", "2.11.2")
1818

1919
libraryDependencies ++= Seq(
20+
"org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
2021
"commons-io" % "commons-io" % "2.4",
21-
"org.scalatest" %% "scalatest" % "2.2.0" % "test",
22+
"org.scalatest" %% "scalatest" % "2.2.1" % "test",
2223
"com.typesafe.scala-logging" %% "scala-logging-slf4j" % "2.1.2" % "test",
2324
"org.mockito" % "mockito-all" % "1.9.5" % "test",
2425
"joda-time" % "joda-time" % "2.3" % "test",
2526
"org.joda" % "joda-convert" % "1.3.1" % "test",
2627
"org.slf4j" % "slf4j-api" % "1.7.7" % "test"
2728
)
2829

29-
libraryDependencies += {
30-
"org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided"
31-
}
32-
3330
libraryDependencies := {
3431
CrossVersion.partialVersion(scalaVersion.value) match {
3532
case Some((2, scalaMajor)) if scalaMajor == 11 =>
36-
EnvSupport.setEnv("CrossBuildScalaVersion", "2.11.0")
33+
EnvSupport.setEnv("CrossBuildScalaVersion", "2.11.2")
3734
libraryDependencies.value :+ "org.scala-lang.modules" %% "scala-xml" % "1.0.1"
3835
case _ =>
3936
EnvSupport.setEnv("CrossBuildScalaVersion", "2.10.4")

src/main/scala/scoverage/plugin.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package scoverage
22

3-
import scala.tools.nsc.plugins.{PluginComponent, Plugin}
3+
import java.io.File
4+
import java.util.concurrent.atomic.AtomicInteger
5+
46
import scala.tools.nsc._
7+
import scala.tools.nsc.plugins.{Plugin, PluginComponent}
58
import scala.tools.nsc.transform.{Transform, TypingTransformers}
6-
import java.util.concurrent.atomic.AtomicInteger
7-
import scala.reflect.internal.ModifierFlags
8-
import java.io.File
9-
import scala.reflect.internal.util.SourceFile
9+
import scala.tools.nsc.util.SourceFile
1010

1111
/** @author Stephen Samuel */
1212
class ScoveragePlugin(val global: Global) extends Plugin {

src/main/scala/scoverage/report/ScoverageXmlWriter.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package scoverage.report
22

3-
import scala.xml.{PrettyPrinter, Node}
3+
import scala.xml.{Utility, PrettyPrinter, Node}
44
import java.io.File
55
import org.apache.commons.io.FileUtils
66
import scoverage._
@@ -32,7 +32,7 @@ class ScoverageXmlWriter(sourceDir: File, outputDir: File, debug: Boolean) {
3232
tree={stmt.treeName}
3333
branch={stmt.branch.toString}
3434
invocation-count={stmt.count.toString}>
35-
{stmt.desc}
35+
{Utility.escape(stmt.desc)}
3636
</statement>
3737

3838
case false =>

0 commit comments

Comments
 (0)