bump to gradle 3.0

Author: maiflai

build.gradle

@@ -45,7 +45,7 @@ dependencies {
     compile gradleApi()
     compile localGroovy()
     scoverage "org.scoverage:scalac-scoverage-plugin_2.11:1.1.1"
-    testCompile 'org.hamcrest:hamcrest-library:1.3'
+    testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-library:1.3'
 }
 
 task groovydocJar(type: Jar, dependsOn: groovydoc) {

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.9-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-3.0-all.zip

src/main/groovy/org/scoverage/ScoverageExtension.groovy

@@ -21,18 +21,6 @@ import java.util.concurrent.Callable
  */
 class ScoverageExtension {
 
-    private static boolean isEscaped(String argument) {
-        return (argument.startsWith('"') && argument.endsWith('"')) || (argument.startsWith('\'') && argument.endsWith('\''))
-    }
-
-    static String escape(String argument) {
-        if (isEscaped(argument)) {
-            return argument
-        } else {
-            return "\"$argument\""
-        }
-    }
-
     /** a directory to write working files to */
     File dataDir
     /** a directory to write final output to */
@@ -158,14 +146,10 @@ class ScoverageExtension {
                 if (extension.highlighting) {
                     parameters.add('-Yrangepos')
                 }
-                if (scalaCompileOptions.useAnt) {
-                    scalaCompileOptions.additionalParameters = parameters.collect { escape(it) }
-                } else {
-                    doFirst {
-                        GFileUtils.deleteDirectory(destinationDir)
-                    }
-                    scalaCompileOptions.additionalParameters = parameters
+                doFirst {
+                    GFileUtils.deleteDirectory(destinationDir)
                 }
+                scalaCompileOptions.additionalParameters = parameters
                 // the compile task creates a store of measured statements
                 outputs.file(new File(extension.dataDir, 'scoverage.coverage.xml'))
             }

src/test/groovy/org/scoverage/AcceptanceTestUtils.groovy

@@ -20,14 +20,13 @@ class AcceptanceTestUtils {
         parser.setFeature('http://apache.org/xml/features/nonvalidating/load-external-dtd', false)
     }
 
-    protected BuildLauncher setupBuild(File projectRoot, boolean useAnt) {
+    protected BuildLauncher setupBuild(File projectRoot) {
         return GradleConnector.
             newConnector().
             forProjectDirectory(projectRoot).
             connect().
             newBuild().
             withArguments(
-                    "-PuseAnt=$useAnt",
                     '--init-script',
                     new File(System.properties.getProperty('user.dir'), 'init-scoverage.gradle').toString())
     }

src/test/groovy/org/scoverage/AggregationAcceptanceTest.groovy

@@ -4,39 +4,24 @@ import org.junit.Test
 
 class AggregationAcceptanceTest extends AcceptanceTestUtils {
 
-    private static File aggregateReportDir(File baseDir) {
-        return new File(baseDir, 'build/scoverage-aggregate')
-    }
-
-    private testWater(boolean useAnt) throws Exception {
+    @Test
+    public void testMultiProjectAggregationWithZinc() throws Exception {
         File projectDir = new File('src/test/water')
-
-        def build = setupBuild(projectDir, useAnt)
+        def build = setupBuild(projectDir)
         build.forTasks('clean', 'reportScoverage', 'aggregateScoverage').run()
-
         def indexHtml = new File(aggregateReportDir(projectDir), 'index.html')
         checkFile('an aggregated index HTML file', indexHtml, true)
-
         def cobertura = new File(aggregateReportDir(projectDir), 'cobertura.xml')
         checkFile('an aggregated cobertura XML file', cobertura, true)
-
         def scoverageXml = new File(aggregateReportDir(projectDir), 'scoverage.xml')
         checkFile('an aggregated scoverage XML file', scoverageXml, true)
-
         def krillsHtml = new File(aggregateReportDir(projectDir), 'krills.html')
         checkFile('a HTML file for \'krills\' sub-project', krillsHtml, true)
-
         def whalesHtml = new File(aggregateReportDir(projectDir), 'whales.html')
         checkFile('a HTML file for \'whales\' sub-project', whalesHtml, true)
     }
 
-    @Test
-    public void testMultiProjectAggregationWithAnt() throws Exception {
-        testWater(true)
-    }
-
-    @Test
-    public void testMultiProjectAggregationWithZinc() throws Exception {
-        testWater(false)
+    private static File aggregateReportDir(File baseDir) {
+        return new File(baseDir, 'build/scoverage-aggregate')
     }
 }

src/test/groovy/org/scoverage/ScoverageExtensionTest.groovy

@@ -7,40 +7,22 @@ import static org.junit.Assert.assertThat
 
 class SeparateTestsAcceptanceTest extends AcceptanceTestUtils {
 
-    private void testSeparate(boolean useAnt) throws Exception {
+    @Test
+    public void testSeparateTestsWithZinc() throws Exception {
         File projectDir = new File('src/test/separate-tests')
         File subprojectDir = new File(projectDir, 'a')
         File testsSubprojectDir = new File(projectDir, 'a-tests')
-
-        def build = setupBuild(projectDir, useAnt)
+        def build = setupBuild(projectDir)
         build.forTasks('clean', 'reportScoverage').run()
-
-        // ensure report is generated in base project ...
         def indexHtml = new File(reportDir(subprojectDir), 'index.html')
         checkFile('an index HTML file', indexHtml, true)
-
-        // ... but not in test project ...
         def testsIndexHtml = new File(reportDir(testsSubprojectDir), 'index.html')
         checkFile('an index HTML file', testsIndexHtml, false)
-
-        // ... and 'Hello.scala' is present there ...
         def helloHtml = new File(reportDir(subprojectDir), 'src/main/scala/hello/Hello.scala.html')
         checkFile('Hello.scala html file', helloHtml, true)
-
-        // ... and both statement and branch coverage is 100%
         def branchCoverage = coverage(reportDir(subprojectDir), CoverageType.Branch)
         def statementCoverage = coverage(reportDir(subprojectDir), CoverageType.Statement)
         assertThat('Branch coverage should be 100%, was ' + branchCoverage, branchCoverage, closeTo(100.0, 1.0))
         assertThat('Statement coverage should be 100%, was ' + statementCoverage, statementCoverage, closeTo(100.0, 1.0))
     }
-
-    @Test
-    public void testSeparateTestsWithAnt() throws Exception {
-        testSeparate(true)
-    }
-
-    @Test
-    public void testSeparateTestsWithZinc() throws Exception {
-        testSeparate(false)
-    }
 }

src/test/groovy/org/scoverage/SeparateTestsAcceptanceTest.groovy

@@ -4,12 +4,12 @@ import org.junit.Test
 
 class SimpleReportAcceptanceTest extends AcceptanceTestUtils {
 
-    private testHappyDay(boolean useAnt) throws Exception {
-        File projectRoot = new File('src/test/happy day')
-        def build = setupBuild(projectRoot, useAnt)
 
+    @Test
+    public void testZincProjectWithCompleteCoverage() throws Exception {
+        File projectRoot = new File('src/test/happy day')
+        def build = setupBuild(projectRoot)
         build.forTasks('clean', 'checkScoverage').run()
-
         def html = new File(reportDir(projectRoot), 'index.html')
         checkFile('an index HTML file', html, true)
         def cobertura = new File(reportDir(projectRoot), 'cobertura.xml')
@@ -18,20 +18,10 @@ class SimpleReportAcceptanceTest extends AcceptanceTestUtils {
         checkFile('a scoverage XML file', scoverageXml, true)
     }
 
-    @Test
-    public void testAntProjectWithCompleteCoverage() throws Exception {
-        testHappyDay(true)
-    }
-
-    @Test
-    public void testZincProjectWithCompleteCoverage() throws Exception {
-        testHappyDay(false)
-    }
-
     @Test
     public void testRun() throws Exception {
         File projectRoot = new File('src/test/runtime')
-        def build = setupBuild(projectRoot, true)
+        def build = setupBuild(projectRoot)
         build.forTasks('clean', 'run').run()
     }
 }

src/test/groovy/org/scoverage/SimpleReportAcceptanceTest.groovy

@@ -25,8 +25,4 @@ dependencies {
 checkScoverage {
     minimumRate = 1.0
     coverageType = 'Line'
-}
-
-tasks.withType(ScalaCompile) {
-    scalaCompileOptions.useAnt = project.hasProperty('useAnt') ? project.property('useAnt').toBoolean() : true
 }