Update the project according to the current (gradle 5.0) plugin development configurations

Author: eyalroth

.gitignore

@@ -1,5 +1,6 @@
 classes
 build
+out
 .gradle
 
 *.iml

build.gradle

@@ -1,25 +1,17 @@
-// First, apply the publishing plugin
-buildscript {
-    repositories {
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-    dependencies {
-        classpath "com.gradle.publish:plugin-publish-plugin:0.9.10"
-    }
-}
-
-apply plugin: "com.gradle.plugin-publish"
-description = 'gradle-scoverage is a Gradle plugin for calculating code coverage using Scoverage'
-if (project.version == 'unspecified') {
-    version = '2.0.0-SNAPSHOT'
+plugins {
+    id 'java-gradle-plugin'
+    id "com.gradle.plugin-publish" version "0.10.0"
+    id "org.jetbrains.gradle.plugin.idea-ext" version "0.4.2"
 }
 
 repositories {
-    mavenCentral()
+    jcenter()
 }
 
+group 'org.scoverage'
+description = 'gradle-scoverage is a Gradle plugin for calculating code coverage using Scoverage'
+version = '2.0.0-SNAPSHOT'
+
 ext {
     website = 'http://scoverage.org'
     vcsUrl = 'https://github.com/scoverage/gradle-scoverage.git'
@@ -28,24 +20,37 @@ ext {
     sonatypePass = System.env.SONATYPE_PASS
 }
 
-apply plugin: 'idea'
+gradlePlugin {
+    plugins {
+        gradleScoverage {
+            id = 'org.scoverage'
+            implementationClass = 'org.scoverage.ScoveragePlugin'
+        }
+    }
+}
+
+pluginBundle {
+    website = project.website
+    vcsUrl = ext.vcsUrl
+    description = project.description
+    tags = ['coverage', 'scala', 'scoverage']
+    plugins {
+        scoveragePlugin {
+            displayName = 'Gradle Scoverage plugin'
+        }
+    }
+}
+
 apply plugin: 'maven'
 apply plugin: 'groovy'
 
-group 'org.scoverage'
 sourceCompatibility = '1.6'
 targetCompatibility = '1.6'
 
-configurations {
-    scoverage
-    compile.extendsFrom scoverage
-}
-
 dependencies {
-    compile gradleApi()
-    compile localGroovy()
-    scoverage "org.scoverage:scalac-scoverage-plugin_2.11:1.1.1"
-    testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-library:1.3'
+    compile "org.scoverage:scalac-scoverage-plugin_2.12:1.3.1"
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.hamcrest:hamcrest-library:1.3'
 }
 
 task groovydocJar(type: Jar, dependsOn: groovydoc) {
@@ -58,10 +63,6 @@ task sourcesJar(type: Jar) {
     classifier = 'sources'
 }
 
-test {
-    dependsOn jar
-}
-
 artifacts {
     archives jar
     archives groovydocJar
@@ -75,25 +76,11 @@ if (project.properties.containsKey('signing.keyId')) {
     }
 }
 
-pluginBundle {
-    website = project.website
-    vcsUrl = project.vcsUrl
-    description = project.description
-    tags = ['coverage', 'scala', 'scoverage']
-    withDependencies { it.clear() }
-    plugins {
-        scoveragePlugin {
-            id = 'org.scoverage'
-            displayName = 'Gradle Scoverage plugin'
-        }
-    }
-}
-
 uploadArchives {
     repositories {
         mavenDeployer {
             if (project.properties.containsKey('signing.keyId')) {
-              beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
             }
 
             snapshotRepository(url: 'https://oss.sonatype.org/content/repositories/snapshots') {
@@ -132,8 +119,30 @@ uploadArchives {
                     developer {
                         id 'D-Roch'
                     }
+                    developer {
+                        id 'eyalroth'
+                    }
                 }
             }
         }
     }
 }
+
+// see https://stackoverflow.com/questions/44679007
+task fixIdeaPluginClasspath {
+    doFirst {
+        configure(tasks.pluginUnderTestMetadata) {
+            def ideaClassesPath = project.buildDir.toPath().resolveSibling("out").resolve("production")
+            def newClasspath = pluginClasspath as List
+            newClasspath.add(0, ideaClassesPath)
+            pluginClasspath.setFrom(newClasspath)
+        }
+    }
+}
+pluginUnderTestMetadata.mustRunAfter(fixIdeaPluginClasspath)
+
+idea.project.settings {
+    taskTriggers {
+        beforeBuild fixIdeaPluginClasspath, pluginUnderTestMetadata
+    }
+}

init-scoverage.gradle

@@ -1,7 +1,6 @@
 package org.scoverage
 
-import org.gradle.tooling.BuildLauncher
-import org.gradle.tooling.GradleConnector
+import org.gradle.testkit.runner.GradleRunner
 import org.hamcrest.core.Is
 import org.junit.Assert
 
@@ -20,15 +19,16 @@ class AcceptanceTestUtils {
         parser.setFeature('http://apache.org/xml/features/nonvalidating/load-external-dtd', false)
     }
 
-    protected BuildLauncher setupBuild(File projectRoot) {
-        return GradleConnector.
-            newConnector().
-            forProjectDirectory(projectRoot).
-            connect().
-            newBuild().
-            withArguments(
-                    '--init-script',
-                    new File(System.properties.getProperty('user.dir'), 'init-scoverage.gradle').toString())
+    protected void runBuild(File projectRoot, String... tasks) {
+        def runner = GradleRunner
+                .create()
+                .withProjectDir(projectRoot)
+                .withPluginClasspath()
+                .forwardOutput()
+
+        def arguments = tasks + "-PscoverageVersion=1.3.1"
+
+        runner.withArguments(arguments as List).build()
     }
 
     protected void checkFile(String description, File file, boolean shouldExist) throws Exception {

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

@@ -7,8 +7,7 @@ class AggregationAcceptanceTest extends AcceptanceTestUtils {
     @Test
     public void testMultiProjectAggregation() throws Exception {
         File projectDir = new File('src/test/water')
-        def build = setupBuild(projectDir)
-        build.forTasks('clean', 'aggregateScoverage').run()
+        runBuild(projectDir, 'clean', 'aggregateScoverage')
         def indexHtml = new File(aggregateReportDir(projectDir), 'index.html')
         checkFile('an aggregated index HTML file', indexHtml, true)
         def cobertura = new File(aggregateReportDir(projectDir), 'cobertura.xml')

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

@@ -12,8 +12,7 @@ class SeparateTestsAcceptanceTest extends AcceptanceTestUtils {
         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)
-        build.forTasks('clean', 'reportScoverage').run()
+        runBuild(projectDir, 'clean', 'reportScoverage')
         def indexHtml = new File(reportDir(subprojectDir), 'index.html')
         checkFile('an index HTML file', indexHtml, true)
         def testsIndexHtml = new File(reportDir(testsSubprojectDir), 'index.html')

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

@@ -8,8 +8,7 @@ class SimpleReportAcceptanceTest extends AcceptanceTestUtils {
     @Test
     public void testProjectWithCompleteCoverage() throws Exception {
         File projectRoot = new File('src/test/happy day')
-        def build = setupBuild(projectRoot)
-        build.forTasks('clean', 'checkScoverage').run()
+        runBuild(projectRoot, 'clean', 'checkScoverage')
         def html = new File(reportDir(projectRoot), 'index.html')
         checkFile('an index HTML file', html, true)
         def cobertura = new File(reportDir(projectRoot), 'cobertura.xml')
@@ -21,7 +20,6 @@ class SimpleReportAcceptanceTest extends AcceptanceTestUtils {
     @Test
     public void testRun() throws Exception {
         File projectRoot = new File('src/test/runtime')
-        def build = setupBuild(projectRoot)
-        build.forTasks('clean', 'run').run()
+        runBuild(projectRoot, 'clean', 'run')
     }
 }

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

@@ -1,23 +1,16 @@
-description = 'a project that builds successfully with 100% coverage'
-
-buildscript {
-    repositories {
-        // need to get up to the working directory of gradle-plugins build
-        flatDir dir: "${project.projectDir}/../../../build/libs"
-    }
-    dependencies {
-        classpath name: 'gradle-scoverage', version: '+'
-    }
+plugins {
+    id 'org.scoverage'
 }
 
-apply plugin: 'org.scoverage'
+description = 'a project that builds successfully with 100% coverage'
 
 repositories {
-    mavenCentral()
+    jcenter()
 }
 
 dependencies {
-    scoverage scoverageLib
+    scoverage "org.scoverage:scalac-scoverage-plugin_2.11:${scoverageVersion}",
+            "org.scoverage:scalac-scoverage-runtime_2.11:${scoverageVersion}"
     compile 'org.scala-lang:scala-library:2.11.0'
     testCompile 'junit:junit:4.11'
 }

src/test/happy day/build.gradle

@@ -1,23 +1,16 @@
-description = 'a project that runs an application and captures scoverage'
-
-buildscript {
-    repositories {
-        // need to get up to the working directory of gradle-plugins build
-        flatDir dir: "${project.projectDir}/../../../build/libs"
-    }
-    dependencies {
-        classpath name: 'gradle-scoverage', version: '+'
-    }
+plugins {
+    id 'org.scoverage'
 }
 
-apply plugin: 'org.scoverage'
+description = 'a project that runs an application and captures scoverage'
 
 repositories {
-    mavenCentral()
+    jcenter()
 }
 
 dependencies {
-    scoverage scoverageLib
+    scoverage "org.scoverage:scalac-scoverage-plugin_2.11:${scoverageVersion}",
+            "org.scoverage:scalac-scoverage-runtime_2.11:${scoverageVersion}"
     compile 'org.scala-lang:scala-library:2.11.0'
 }
 

src/test/runtime/build.gradle

@@ -1,27 +1,29 @@
+plugins {
+    id 'org.scoverage'
+}
+
 description = 'a multi-project with separate tests setup for gradle-scoverage'
 
-buildscript {
+allprojects {
+
     repositories {
-        // need to get up to the working directory of gradle-plugins build
-        flatDir dir: "${project.projectDir}/../../../build/libs"
+        jcenter()
     }
+
+    apply plugin: 'org.scoverage'
+
     dependencies {
-        classpath name: 'gradle-scoverage', version: '+'
+        scoverage "org.scoverage:scalac-scoverage-plugin_2.11:${scoverageVersion}",
+                "org.scoverage:scalac-scoverage-runtime_2.11:${scoverageVersion}"
     }
 }
 
 subprojects {
 
-    repositories {
-        mavenCentral()
-    }
-
     apply plugin: 'scala'
-    apply plugin: 'org.scoverage'
 
     dependencies {
         compile 'org.scala-lang:scala-library:2.11.4'
-        scoverage scoverageLib
 
         testCompile 'junit:junit:4.11'
     }

src/test/separate-tests/build.gradle

@@ -1,24 +1,19 @@
-description = 'a multi-project setup for gradle-scoverage'
-
-buildscript {
-    repositories {
-        // need to get up to the working directory of gradle-plugins build
-        flatDir dir: "${project.projectDir}/../../../build/libs"
-    }
-    dependencies {
-        classpath name: 'gradle-scoverage', version: '+'
-    }
+plugins {
+    id 'org.scoverage'
 }
 
+description = 'a multi-project setup for gradle-scoverage'
+
 allprojects {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 
     apply plugin: 'org.scoverage'
 
     dependencies {
-        scoverage scoverageLib
+        scoverage "org.scoverage:scalac-scoverage-plugin_2.11:${scoverageVersion}",
+                "org.scoverage:scalac-scoverage-runtime_2.11:${scoverageVersion}"
         compile 'org.scala-lang:scala-library:2.11.5'
 
         testCompile 'junit:junit:4.11'