luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4401 from eed3si9n/wip/bump 

Zinc 1.2.3
This commit is contained in:
eugene yokota 2018-10-05 03:31:31 -04:00 committed by GitHub
parent 5649ac0410 1f0680efbf
commit ec26c512cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project/Dependencies.scala
View File

@ -8,10 +8,10 @@ object Dependencies {
val baseScalaVersion = scala212
// sbt modules
private val ioVersion = "1.2.1"
private val ioVersion = "1.2.2"
private val utilVersion = "1.2.2"
private val lmVersion = "1.2.1"
private val zincVersion = "1.2.2"
private val zincVersion = "1.2.3"
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion

6
testing/src/main/scala/sbt/JUnitXmlTestsListener.scala
View File

@ -226,8 +226,10 @@ class JUnitXmlTestsListener(val outputDir: String, logger: Logger) extends Tests
d.truncatedTo(ChronoUnit.SECONDS).format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
private def writeSuite() = {
val legacyFile = new File(targetDir, s"${normalizeName(withTestSuite(_.name))}.xml").getAbsolutePath
val file = new File(targetDir, s"TEST-${normalizeName(withTestSuite(_.name))}.xml").getAbsolutePath
val legacyFile =
new File(targetDir, s"${normalizeName(withTestSuite(_.name))}.xml").getAbsolutePath
val file =
new File(targetDir, s"TEST-${normalizeName(withTestSuite(_.name))}.xml").getAbsolutePath
// TODO would be nice to have a logger and log this with level debug
// System.err.println("Writing JUnit XML test report: " + file)
XML.save(legacyFile, withTestSuite(_.stop()), "UTF-8", true, null)