Merge pull request #276 from maiflai/seq

gslowikowski · web-flow · commit a3ef7505e14f · 2019-09-18T19:09:27.000+02:00
Add a new aggregation method which is easily called from Groovy
diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoverageAggregator.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoverageAggregator.scala
@@ -11,6 +11,9 @@ object CoverageAggregator {
     aggregate(IOUtils.scoverageDataDirsSearch(baseDir))
   }
 
+  // to be used by gradle-scoverage plugin
+  def aggregate(dataDirs: Array[File]): Option[Coverage] = aggregate(dataDirs.toSeq)
+
   def aggregate(dataDirs: Seq[File]): Option[Coverage] = {
     println(s"[info] Found ${dataDirs.size} subproject scoverage data directories [${dataDirs.mkString(",")}]")
     if (dataDirs.size > 0) {

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ object CoverageAggregator {`
`11`	`11`	`aggregate(IOUtils.scoverageDataDirsSearch(baseDir))`
`12`	`12`	`}`
`13`	`13`
	`14`	`+ // to be used by gradle-scoverage plugin`
	`15`	`+ def aggregate(dataDirs: Array[File]): Option[Coverage] = aggregate(dataDirs.toSeq)`
	`16`	`+`
`14`	`17`	`def aggregate(dataDirs: Seq[File]): Option[Coverage] = {`
`15`	`18`	`println(s"[info] Found ${dataDirs.size} subproject scoverage data directories [${dataDirs.mkString(",")}]")`
`16`	`19`	`if (dataDirs.size > 0) {`