From e51a7a9d643ed53ba0763d11e85f28619e6e590c Mon Sep 17 00:00:00 2001 From: Oleksii Lisikh Date: Wed, 19 Jun 2019 20:34:36 +0200 Subject: [PATCH 1/2] Issue #102: Use deprecated JavaConversions to maintain backward compatibility with Scala 2.11 --- src/main/groovy/org/scoverage/ScoverageAggregate.groovy | 7 ++++--- src/main/groovy/org/scoverage/ScoverageReport.groovy | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/groovy/org/scoverage/ScoverageAggregate.groovy b/src/main/groovy/org/scoverage/ScoverageAggregate.groovy index 89de7de..e41d16b 100644 --- a/src/main/groovy/org/scoverage/ScoverageAggregate.groovy +++ b/src/main/groovy/org/scoverage/ScoverageAggregate.groovy @@ -6,7 +6,8 @@ import org.gradle.api.provider.Property import org.gradle.api.tasks.Input import org.gradle.api.tasks.OutputDirectory import org.gradle.api.tasks.TaskAction -import scala.collection.JavaConverters +// don't use scala.collection.JavaConverters as it breaks backward compatibility with scala 2.11 +import scala.collection.JavaConversions import scoverage.IOUtils import scoverage.report.CoverageAggregator @@ -47,9 +48,9 @@ class ScoverageAggregate extends DefaultTask { coverage = CoverageAggregator.aggregate(rootDir, deleteReportsOnAggregation.get()) } else { def reportFiles = dirsToAggregateFrom.get().collectMany { - JavaConverters.seqAsJavaList(IOUtils.reportFileSearch(it, IOUtils.isReportFile())) + JavaConversions.seqAsJavaList(IOUtils.reportFileSearch(it, IOUtils.isReportFile())) } - coverage = CoverageAggregator.aggregate(JavaConverters.asScalaBuffer(reportFiles), deleteReportsOnAggregation.get()) + coverage = CoverageAggregator.aggregate(JavaConversions.asScalaBuffer(reportFiles), deleteReportsOnAggregation.get()) } reportDir.get().deleteDir() diff --git a/src/main/groovy/org/scoverage/ScoverageReport.groovy b/src/main/groovy/org/scoverage/ScoverageReport.groovy index 37195b0..d5c5691 100644 --- a/src/main/groovy/org/scoverage/ScoverageReport.groovy +++ b/src/main/groovy/org/scoverage/ScoverageReport.groovy @@ -6,6 +6,7 @@ import org.gradle.api.tasks.CacheableTask import org.gradle.api.tasks.Input import org.gradle.api.tasks.OutputDirectory import org.gradle.api.tasks.TaskAction +// don't use scala.collection.JavaConverters as it breaks backward compatibility with scala 2.11 import scala.collection.JavaConversions import scala.collection.Seq import scala.collection.Set From 56f0d58027740efeddcf847e537ea2c3e2a69fbd Mon Sep 17 00:00:00 2001 From: Oleksii Lisikh Date: Wed, 19 Jun 2019 20:43:43 +0200 Subject: [PATCH 2/2] Issue #102: Show stdout of functional tests --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index e70daea..1c7fb4d 100644 --- a/build.gradle +++ b/build.gradle @@ -65,6 +65,9 @@ task functionalTest(type: Test) { group = 'verification' testClassesDirs = sourceSets.functionalTest.output.classesDirs classpath = sourceSets.functionalTest.runtimeClasspath + + testLogging.showStandardStreams = true + mustRunAfter test }