Skip to content

Commit 7e87fef

Browse files
committed
Add support for Scala 2.13
1 parent 2d52519 commit 7e87fef

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

Diff for: src/crossScalaVersionTest/java/org/scoverage/Scala213Test.java

-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package org.scoverage;
22

3-
import org.junit.Ignore;
4-
53
/**
64
* Tests is currently ignored as support for Scala 2.13 is not available yet.
75
*
86
* @see <a href="https://github.com/scoverage/gradle-scoverage/issues/106">Issue #106</a>.
97
*/
10-
@Ignore
118
public class Scala213Test extends ScalaVersionTest {
129
public Scala213Test() {
1310
super("2_13");

Diff for: src/main/groovy/org/scoverage/ScoverageWriter.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22

33
import org.gradle.api.logging.Logger;
44
import scala.Some;
5-
import scala.collection.JavaConverters;
6-
import scala.collection.mutable.Buffer;
75
import scoverage.Constants;
86
import scoverage.Coverage;
97
import scoverage.report.CoberturaXmlWriter;
108
import scoverage.report.ScoverageHtmlWriter;
119
import scoverage.report.ScoverageXmlWriter;
1210

1311
import java.io.File;
14-
import java.util.Arrays;
12+
import java.lang.reflect.Field;
1513

1614
/**
1715
* Util for generating and saving coverage files.
@@ -46,7 +44,7 @@ public void write(File sourceDir,
4644
Boolean coverageOutputCobertura,
4745
Boolean coverageOutputXML,
4846
Boolean coverageOutputHTML,
49-
Boolean coverageDebug) {
47+
Boolean coverageDebug) throws NoSuchFieldException, IllegalAccessException {
5048

5149
logger.info("[scoverage] Generating scoverage reports...");
5250

@@ -76,8 +74,11 @@ public void write(File sourceDir,
7674
}
7775

7876
if (coverageOutputHTML) {
79-
Buffer<File> sources = JavaConverters.asScalaBufferConverter(Arrays.asList(sourceDir)).asScala();
80-
new ScoverageHtmlWriter(sources, reportDir, new Some<>(sourceEncoding)).write(coverage);
77+
ScoverageHtmlWriter writer = new ScoverageHtmlWriter(sourceDir, reportDir);
78+
Field field = ScoverageHtmlWriter.class.getDeclaredField("sourceEncoding");
79+
field.setAccessible(true);
80+
field.set(writer, new Some<>(sourceEncoding));
81+
writer.write(coverage);
8182
logger.info("[scoverage] Written HTML report to " +
8283
reportDir.getAbsolutePath() +
8384
File.separator +

0 commit comments

Comments
 (0)