Skip to content

Source encoding parametrization - fix for issue scoverage/scalac-scoverage-plugin#134 #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 8, 2016
Merged

Source encoding parametrization - fix for issue scoverage/scalac-scoverage-plugin#134 #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/main/scala/scoverage/ScoverageSbtPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
coverageOutputHTML.value,
coverageOutputDebug.value,
coverageOutputTeamCity.value,
sourceEncoding((scalacOptions in (Compile)).value),
log)

checkCoverage(cov, log, coverageMinimum.value, coverageFailOnMinimum.value)
Expand All @@ -105,6 +106,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
coverageOutputHTML.value,
coverageOutputDebug.value,
coverageOutputTeamCity.value,
sourceEncoding((scalacOptions in (Compile)).value),
log)
val cfmt = cov.statementCoverageFormatted
log.info(s"Aggregation complete. Coverage was [$cfmt]")
Expand Down Expand Up @@ -157,6 +159,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
coverageOutputHTML: Boolean,
coverageDebug: Boolean,
coverageOutputTeamCity: Boolean,
coverageSourceEncoding: Option[String],
log: Logger): Unit = {
log.info(s"Generating scoverage reports...")

Expand All @@ -180,7 +183,7 @@ object ScoverageSbtPlugin extends AutoPlugin {

if (coverageOutputHTML) {
log.info(s"Written HTML coverage report [${reportDir.getAbsolutePath}/index.html]")
new ScoverageHtmlWriter(compileSourceDirectories, reportDir).write(coverage)
new ScoverageHtmlWriter(compileSourceDirectories, reportDir, coverageSourceEncoding).write(coverage)
}
if (coverageOutputTeamCity) {
log.info("Writing coverage report to teamcity")
Expand Down Expand Up @@ -259,4 +262,8 @@ object ScoverageSbtPlugin extends AutoPlugin {

log.info(s"All done. Coverage was [$cfmt%]")
}

private def sourceEncoding(scalacOptions: Seq[String]): Option[String] =
scalacOptions.sliding(2).collectFirst { case Seq("-encoding", encoding) => encoding }

}