Skip to content

Issue #102: Use deprecated JavaConversions to maintain backward compatibility with Scala 2.11 #105

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 2 commits into from
Jun 23, 2019
Merged

Issue #102: Use deprecated JavaConversions to maintain backward compatibility with Scala 2.11 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e51a7a9
Issue #102: Use deprecated JavaConversions to maintain backward compa…
Jun 19, 2019
56f0d58
Issue #102: Show stdout of functional tests
Jun 19, 2019
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
3 changes: 3 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ task functionalTest(type: Test) {
group = 'verification'
testClassesDirs = sourceSets.functionalTest.output.classesDirs
classpath = sourceSets.functionalTest.runtimeClasspath

testLogging.showStandardStreams = true

mustRunAfter test
}

Expand Down
7 changes: 4 additions & 3 deletions src/main/groovy/org/scoverage/ScoverageAggregate.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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()
Expand Down
1 change: 1 addition & 0 deletions src/main/groovy/org/scoverage/ScoverageReport.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down