Skip to content

Commit b019d87

Browse files
authored
Bump version of scala-xml to 2.0.0 (#384)
1 parent 8317988 commit b019d87

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ lazy val plugin =
118118
crossTarget := target.value / s"scala-${scalaVersion.value}",
119119
crossVersion := CrossVersion.full,
120120
libraryDependencies ++= Seq(
121-
"org.scala-lang.modules" %% "scala-xml" % "1.3.0",
121+
"org.scala-lang.modules" %% "scala-xml" % "2.0.0",
122122
"org.scalatest" %% "scalatest" % scalatestVersion % Test,
123123
"org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided
124124
),

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

+14-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ package scoverage
33
import java.io.File
44
import java.util.UUID
55
import javax.xml.parsers.DocumentBuilderFactory
6+
import javax.xml.parsers.SAXParserFactory
67

8+
import scala.xml.Elem
79
import scala.xml.XML
10+
import scala.xml.factory.XMLLoader
811

912
import org.scalatest.BeforeAndAfter
1013
import org.scalatest.OneInstancePerTest
@@ -314,7 +317,17 @@ class CoberturaXmlWriterTest
314317
val writer = new CoberturaXmlWriter(sourceRoot, dir)
315318
writer.write(coverage)
316319

317-
val xml = XML.loadFile(fileIn(dir))
320+
// Needed to acount for https://github.com/scala/scala-xml/pull/177
321+
val customXML: XMLLoader[Elem] = XML.withSAXParser {
322+
val factory = SAXParserFactory.newInstance()
323+
factory.setFeature(
324+
"http://apache.org/xml/features/nonvalidating/load-external-dtd",
325+
false
326+
)
327+
factory.newSAXParser()
328+
}
329+
330+
val xml = customXML.loadFile(fileIn(dir))
318331

319332
assert((xml \\ "coverage" \ "@line-rate").text === "0.33", "line-rate")
320333
assert((xml \\ "coverage" \ "@branch-rate").text === "0.50", "branch-rate")

0 commit comments

Comments
 (0)