From 4a1112800b6b51d1013df4c86a11f2697e267105 Mon Sep 17 00:00:00 2001 From: Helder Pereira Date: Fri, 13 Aug 2021 08:48:11 +0100 Subject: [PATCH] Fix deprecated destinationDir property --- build.gradle | 10 ++++++++-- .../scoverage/ScalaCrossVersionAggregationTest.java | 7 ------- .../java/org/scoverage/CompositeBuildTest.java | 2 +- .../java/org/scoverage/ScalaJavaMultiModuleTest.java | 1 - .../java/org/scoverage/ScoverageFunctionalTest.java | 7 ++++--- src/main/groovy/org/scoverage/CoverageChecker.groovy | 2 +- src/main/groovy/org/scoverage/ScoveragePlugin.groovy | 9 ++++++--- src/main/groovy/org/scoverage/ScoverageRunner.groovy | 2 +- 8 files changed, 21 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index 03f32f4..0b56067 100644 --- a/build.gradle +++ b/build.gradle @@ -84,7 +84,10 @@ task crossScalaVersionTest(type: Test) { classpath = sourceSets.crossScalaVersionTest.runtimeClasspath forkEvery = 1 // crucial to run every test in its own JVM - testLogging.showStandardStreams = true + testLogging { + events 'passed', 'failed', 'skipped' + showStandardStreams = System.env.CI == 'true' + } mustRunAfter test } @@ -96,7 +99,10 @@ task functionalTest(type: Test) { testClassesDirs = sourceSets.functionalTest.output classpath = sourceSets.functionalTest.runtimeClasspath - testLogging.showStandardStreams = true + testLogging { + events 'passed', 'failed', 'skipped' + showStandardStreams = System.env.CI == 'true' + } mustRunAfter crossScalaVersionTest } diff --git a/src/crossScalaVersionTest/java/org/scoverage/ScalaCrossVersionAggregationTest.java b/src/crossScalaVersionTest/java/org/scoverage/ScalaCrossVersionAggregationTest.java index 62850aa..e6c3bf3 100644 --- a/src/crossScalaVersionTest/java/org/scoverage/ScalaCrossVersionAggregationTest.java +++ b/src/crossScalaVersionTest/java/org/scoverage/ScalaCrossVersionAggregationTest.java @@ -2,13 +2,6 @@ import org.junit.Assert; import org.junit.Test; -import org.junit.jupiter.api.Tag; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.scoverage.ScoverageFunctionalTest; -import org.scoverage.ScoveragePlugin; - -import java.io.File; public class ScalaCrossVersionAggregationTest extends ScoverageFunctionalTest { diff --git a/src/functionalTest/java/org/scoverage/CompositeBuildTest.java b/src/functionalTest/java/org/scoverage/CompositeBuildTest.java index 98a9ee8..21a5c6d 100644 --- a/src/functionalTest/java/org/scoverage/CompositeBuildTest.java +++ b/src/functionalTest/java/org/scoverage/CompositeBuildTest.java @@ -34,7 +34,7 @@ public void reportComposite() { private AssertableBuildResult runComposite(String... arguments) { - List fullArguments = new ArrayList(); + List fullArguments = new ArrayList<>(); fullArguments.add("-p"); fullArguments.add("proj1"); fullArguments.add("--include-build"); diff --git a/src/functionalTest/java/org/scoverage/ScalaJavaMultiModuleTest.java b/src/functionalTest/java/org/scoverage/ScalaJavaMultiModuleTest.java index 6f094bf..8a35add 100644 --- a/src/functionalTest/java/org/scoverage/ScalaJavaMultiModuleTest.java +++ b/src/functionalTest/java/org/scoverage/ScalaJavaMultiModuleTest.java @@ -1,6 +1,5 @@ package org.scoverage; -import org.gradle.testkit.runner.TaskOutcome; import org.junit.Assert; import org.junit.Test; diff --git a/src/functionalTest/java/org/scoverage/ScoverageFunctionalTest.java b/src/functionalTest/java/org/scoverage/ScoverageFunctionalTest.java index c1bd0b1..e08d1e5 100644 --- a/src/functionalTest/java/org/scoverage/ScoverageFunctionalTest.java +++ b/src/functionalTest/java/org/scoverage/ScoverageFunctionalTest.java @@ -1,7 +1,7 @@ package org.scoverage; import groovy.util.Node; -import groovy.util.XmlParser; +import groovy.xml.XmlParser; import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.BuildTask; import org.gradle.testkit.runner.GradleRunner; @@ -87,7 +87,7 @@ protected AssertableBuildResult runAndFail(String... arguments) { protected AssertableBuildResult dryRun(String... arguments) { - List withDryArgument = new ArrayList(Arrays.asList(arguments)); + List withDryArgument = new ArrayList<>(Arrays.asList(arguments)); withDryArgument.add("--dry-run"); return run(withDryArgument.toArray(new String[]{})); } @@ -119,7 +119,7 @@ private Double coverage(File reportDir, CoverageType coverageType) throws IOExce private void configureArguments(String... arguments) { - List fullArguments = new ArrayList(); + List fullArguments = new ArrayList<>(); fullArguments.add("-PscalaVersionMajor=2"); fullArguments.add("-PscalaVersionMinor=12"); @@ -127,6 +127,7 @@ private void configureArguments(String... arguments) { fullArguments.add("-PjunitVersion=5.3.2"); fullArguments.add("-PjunitPlatformVersion=1.3.2"); fullArguments.add("-PscalatestVersion=3.0.8"); + fullArguments.add("--warning-mode=all"); fullArguments.addAll(Arrays.asList(arguments)); runner.withArguments(fullArguments); diff --git a/src/main/groovy/org/scoverage/CoverageChecker.groovy b/src/main/groovy/org/scoverage/CoverageChecker.groovy index d647f12..1af7b4e 100644 --- a/src/main/groovy/org/scoverage/CoverageChecker.groovy +++ b/src/main/groovy/org/scoverage/CoverageChecker.groovy @@ -1,6 +1,6 @@ package org.scoverage - +import groovy.xml.XmlParser import org.gradle.api.GradleException import org.gradle.api.logging.Logger import org.gradle.internal.impldep.com.google.common.annotations.VisibleForTesting diff --git a/src/main/groovy/org/scoverage/ScoveragePlugin.groovy b/src/main/groovy/org/scoverage/ScoveragePlugin.groovy index f13ac44..a772060 100644 --- a/src/main/groovy/org/scoverage/ScoveragePlugin.groovy +++ b/src/main/groovy/org/scoverage/ScoveragePlugin.groovy @@ -28,7 +28,7 @@ class ScoveragePlugin implements Plugin { static final String DEFAULT_REPORT_DIR = 'reports' + File.separatorChar + 'scoverage' - private final ConcurrentHashMap> taskDependencies = new ConcurrentHashMap<>(); + private final ConcurrentHashMap> taskDependencies = new ConcurrentHashMap<>() @Override void apply(PluginAware pluginAware) { @@ -232,9 +232,10 @@ class ScoveragePlugin implements Plugin { compileTask.configure { if (!graph.hasTask(originalCompileTask)) { project.logger.info("Making scoverage compilation the primary compilation task (instead of compileScala)") - destinationDir = originalCompileTask.destinationDir + destinationDirectory = originalCompileTask.destinationDirectory } else { doFirst { + def destinationDir = destinationDirectory.get().asFile destinationDir.deleteDir() } @@ -243,7 +244,9 @@ class ScoveragePlugin implements Plugin { project.logger.info("Deleting classes compiled by scoverage but non-instrumented (identical to normal compilation)") def originalCompileTaskName = project.sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME) .getCompileTaskName("scala") - def originalDestinationDir = project.tasks[originalCompileTaskName].destinationDir + def originalDestinationDirectory = project.tasks[originalCompileTaskName].destinationDirectory + def originalDestinationDir = originalDestinationDirectory.get().asFile + def destinationDir = destinationDirectory.get().asFile def findFiles = { File dir, Closure condition = null -> def files = [] diff --git a/src/main/groovy/org/scoverage/ScoverageRunner.groovy b/src/main/groovy/org/scoverage/ScoverageRunner.groovy index 713b9e4..a5dd552 100644 --- a/src/main/groovy/org/scoverage/ScoverageRunner.groovy +++ b/src/main/groovy/org/scoverage/ScoverageRunner.groovy @@ -23,7 +23,7 @@ class ScoverageRunner { method.setAccessible(true) runtimeClasspath.files.each { f -> - def url = f.toURL() + def url = f.toURI().toURL() if (!cloader.getURLs().contains(url)) { method.invoke(cloader, url) }