Account for encoding and sourceroot

Author: ckipp01

build.sbt

@@ -2,7 +2,7 @@ name := "sbt-scoverage"
 
 import sbt.ScriptedPlugin.autoImport.scriptedLaunchOpts
 
-def scoverageVersion = "1.4.9+9-a154d161+20210925-1028-SNAPSHOT"
+lazy val scoverageVersion = "33.0.0"
 
 inThisBuild(
   List(

src/main/scala/scoverage/ScoverageSbtPlugin.scala

@@ -184,7 +184,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
           file / Constants.DataDir
       }
 
-    CoverageAggregator.aggregate(dataDirs) match {
+    CoverageAggregator.aggregate(dataDirs, coverageSourceRoot.value) match {
       case Some(cov) =>
         writeReports(
           coverageDataDir.value,
@@ -228,7 +228,11 @@ object ScoverageSbtPlugin extends AutoPlugin {
     reportDir.mkdirs()
 
     if (coverageOutputCobertura) {
-      new CoberturaXmlWriter(compileSourceDirectories, coberturaDir).write(
+      new CoberturaXmlWriter(
+        compileSourceDirectories,
+        coberturaDir,
+        coverageSourceEncoding
+      ).write(
         coverage
       )
       log.info(
@@ -237,11 +241,21 @@ object ScoverageSbtPlugin extends AutoPlugin {
     }
 
     if (coverageOutputXML) {
-      new ScoverageXmlWriter(compileSourceDirectories, reportDir, false).write(
+      new ScoverageXmlWriter(
+        compileSourceDirectories,
+        reportDir,
+        false,
+        coverageSourceEncoding
+      ).write(
         coverage
       )
       if (coverageDebug) {
-        new ScoverageXmlWriter(compileSourceDirectories, reportDir, true).write(
+        new ScoverageXmlWriter(
+          compileSourceDirectories,
+          reportDir,
+          true,
+          coverageSourceEncoding
+        ).write(
           coverage
         )
       }