(#121) Make the plugin compatible with java-platform plugin by removing auto-apply on subprojects

eyalroth · eyalroth · commit 11d50275757b · 2019-10-28T11:07:41.000+02:00
diff --git a/src/functionalTest/java/org.scoverage/ScalaJavaMultiModuleTest.java b/src/functionalTest/java/org.scoverage/ScalaJavaMultiModuleTest.java
@@ -18,16 +18,18 @@ public void checkAndAggregateScoverage() throws Exception {
         AssertableBuildResult result = run("clean", ScoveragePlugin.getCHECK_NAME(),
                 ScoveragePlugin.getAGGREGATE_NAME());
 
-        result.assertTaskOutcome("java_only:" + ScoveragePlugin.getCOMPILE_NAME(), TaskOutcome.NO_SOURCE);
+        result.assertTaskSkipped("java_only:" + ScoveragePlugin.getCOMPILE_NAME());
 
         result.assertTaskSkipped(ScoveragePlugin.getREPORT_NAME());
         result.assertTaskSucceeded("scala_only:" + ScoveragePlugin.getREPORT_NAME());
         result.assertTaskSucceeded("mixed_scala_java:" + ScoveragePlugin.getREPORT_NAME());
         result.assertTaskSkipped("java_only:" + ScoveragePlugin.getREPORT_NAME());
+
         result.assertTaskSucceeded(ScoveragePlugin.getCHECK_NAME());
         result.assertTaskSucceeded("scala_only:" + ScoveragePlugin.getCHECK_NAME());
         result.assertTaskSucceeded("mixed_scala_java:" + ScoveragePlugin.getCHECK_NAME());
         result.assertTaskSkipped("java_only:" + ScoveragePlugin.getCHECK_NAME());
+
         result.assertTaskSucceeded(ScoveragePlugin.getAGGREGATE_NAME());
 
         assertAllReportFilesExist();
diff --git a/src/functionalTest/resources/projects/scala-java-multi-module/build.gradle b/src/functionalTest/resources/projects/scala-java-multi-module/build.gradle
@@ -2,17 +2,16 @@ plugins {
     id 'org.scoverage' apply false
 }
 
+description = 'a multi-module Scala and Java project that builds successfully with 100% coverage'
+
 allprojects {
     repositories {
         jcenter()
     }
 }
 
-description = 'a multi-module Scala and Java project that builds successfully with 100% coverage'
-
-apply plugin: 'org.scoverage'
-
-allprojects {
+subprojects {
+    apply plugin: 'java'
 
     dependencies {
         testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
@@ -21,12 +20,9 @@ allprojects {
     test {
         useJUnitPlatform()
     }
-
-    scoverage {
-        minimumRate = 0.5
-    }
 }
 
+apply plugin: 'org.scoverage'
 scoverage {
     minimumRate = 0.5
 }
diff --git a/src/functionalTest/resources/projects/scala-java-multi-module/java_only/build.gradle b/src/functionalTest/resources/projects/scala-java-multi-module/java_only/build.gradle
@@ -1,6 +1,3 @@
-apply plugin: 'java'
-
 dependencies {
-
     testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
 }
diff --git a/src/functionalTest/resources/projects/scala-java-multi-module/mixed_scala_java/build.gradle b/src/functionalTest/resources/projects/scala-java-multi-module/mixed_scala_java/build.gradle
@@ -1,6 +1,4 @@
-apply plugin: 'java'
 apply plugin: 'scala'
-apply plugin: 'org.scoverage'
 
 dependencies {
     compile group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
@@ -16,4 +14,9 @@ ext.configureSources = { set, name ->
     set.java.srcDirs = []
 }
 configureSources(sourceSets.main, 'main')
-configureSources(sourceSets.test, 'test')
+configureSources(sourceSets.test, 'test')
+
+apply plugin: 'org.scoverage'
+scoverage {
+    minimumRate = 0.5
+}
diff --git a/src/functionalTest/resources/projects/scala-java-multi-module/scala_only/build.gradle b/src/functionalTest/resources/projects/scala-java-multi-module/scala_only/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'scala'
-apply plugin: 'org.scoverage'
 
 dependencies {
     compile group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
@@ -8,3 +7,8 @@ dependencies {
 
     testCompile group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
 }
+
+apply plugin: 'org.scoverage'
+scoverage {
+    minimumRate = 0.5
+}
diff --git a/src/functionalTest/resources/projects/scala-multi-module-cross-version/build.gradle b/src/functionalTest/resources/projects/scala-multi-module-cross-version/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.scoverage'
+    id 'org.scoverage' apply false
 }
 
 allprojects {
@@ -14,6 +14,7 @@ allprojects {
 
     apply plugin: 'java'
     apply plugin: 'scala'
+    apply plugin: 'org.scoverage'
 
     dependencies {
         testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
diff --git a/src/functionalTest/resources/projects/scala-multi-module-multiple-test-tasks/build.gradle b/src/functionalTest/resources/projects/scala-multi-module-multiple-test-tasks/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.scoverage'
+    id 'org.scoverage' apply false
 }
 
 allprojects {
@@ -14,6 +14,7 @@ allprojects {
 
     apply plugin: 'java'
     apply plugin: 'scala'
+    apply plugin: 'org.scoverage'
 
     dependencies {
         compile group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
diff --git a/src/functionalTest/resources/projects/scala-multi-module/build.gradle b/src/functionalTest/resources/projects/scala-multi-module/build.gradle
@@ -1,34 +1,36 @@
 plugins {
-    id 'org.scoverage'
+    id 'org.scoverage' apply false
 }
 
-allprojects {
+description = 'a multi-module Scala project that builds successfully with 100% coverage'
+
+allprojects { p ->
     repositories {
         jcenter()
     }
-}
 
-description = 'a multi-module Scala project that builds successfully with 100% coverage'
+    if (p.name != 'dependencies') {
+        apply plugin: 'java'
+        apply plugin: 'scala'
+        apply plugin: 'org.scoverage'
 
-allprojects {
+        dependencies {
+            implementation platform(project(':dependencies'))
 
-    apply plugin: 'java'
-    apply plugin: 'scala'
+            compile group: 'org.scala-lang', name: 'scala-library'
 
-    dependencies {
-        compile group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
+            testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine'
+            testCompile group: 'org.junit.platform', name: 'junit-platform-runner'
 
-        testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
-        testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
+            testCompile group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}"
+        }
 
-        testCompile group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
-    }
-
-    test {
-        useJUnitPlatform()
-    }
+        test {
+            useJUnitPlatform()
+        }
 
-    scoverage {
-        minimumRate = 0.5
+        scoverage {
+            minimumRate = 0.5
+        }
     }
 }
diff --git a/src/functionalTest/resources/projects/scala-multi-module/dependencies/build.gradle b/src/functionalTest/resources/projects/scala-multi-module/dependencies/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    id 'java-platform'
+}
+
+dependencies {
+    constraints {
+        api group: 'org.scala-lang', name: 'scala-library', version: "${scalaVersionMajor}.${scalaVersionMinor}.${scalaVersionBuild}"
+
+        api group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion
+        api group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion
+
+        api group: 'org.scalatest', name: "scalatest_${scalaVersionMajor}.${scalaVersionMinor}", version: scalatestVersion
+    }
+}
diff --git a/src/functionalTest/resources/projects/scala-multi-module/settings.gradle b/src/functionalTest/resources/projects/scala-multi-module/settings.gradle
@@ -1 +1 @@
-include 'a', 'b', 'common'
+include 'dependencies', 'a', 'b', 'common'
diff --git a/src/main/groovy/org/scoverage/ScoveragePlugin.groovy b/src/main/groovy/org/scoverage/ScoveragePlugin.groovy
@@ -32,11 +32,6 @@ class ScoveragePlugin implements Plugin<PluginAware> {
     void apply(PluginAware pluginAware) {
         if (pluginAware instanceof Project) {
             applyProject(pluginAware)
-            if (pluginAware == pluginAware.rootProject) {
-                pluginAware.subprojects { p ->
-                    p.plugins.apply(ScoveragePlugin)
-                }
-            }
         } else if (pluginAware instanceof Gradle) {
             pluginAware.allprojects { p ->
                 p.plugins.apply(ScoveragePlugin)
@@ -104,7 +99,6 @@ class ScoveragePlugin implements Plugin<PluginAware> {
         def globalReportTask = project.tasks.register(REPORT_NAME, ScoverageAggregate)
         def globalCheckTask = project.tasks.register(CHECK_NAME, OverallCheckTask)
 
-
         project.afterEvaluate {
             def detectedSourceEncoding = compileTask.scalaCompileOptions.encoding
             if (detectedSourceEncoding == null) {
@@ -166,29 +160,6 @@ class ScoveragePlugin implements Plugin<PluginAware> {
                 reportDir = extension.reportDir
             }
 
-            // define aggregation task
-            if (project.childProjects.size() > 0) {
-                def allReportTasks = project.getAllprojects().findResults {
-                    it.tasks.find { task ->
-                        task.name == REPORT_NAME && task instanceof ScoverageAggregate
-                    }
-                }
-
-                def aggregationTask = project.tasks.create(AGGREGATE_NAME, ScoverageAggregate) {
-                    dependsOn(allReportTasks)
-                    group = 'verification'
-                    runner = scoverageRunner
-                    reportDir = extension.reportDir
-                    sourceEncoding.set(detectedSourceEncoding)
-                    deleteReportsOnAggregation = extension.deleteReportsOnAggregation
-                    coverageOutputCobertura = extension.coverageOutputCobertura
-                    coverageOutputXML = extension.coverageOutputXML
-                    coverageOutputHTML = extension.coverageOutputHTML
-                    coverageDebug = extension.coverageDebug
-                }
-                project.tasks[CHECK_NAME].mustRunAfter(aggregationTask)
-            }
-
             // make this project's scoverage compilation depend on scoverage compilation of any other project
             // which this project depends on its normal compilation
             // (essential when running without normal compilation on multi-module projects with inner dependencies)
@@ -308,6 +279,30 @@ class ScoveragePlugin implements Plugin<PluginAware> {
                     }
                 }
             }
+
+            // define aggregation task
+            if (project.childProjects.size() > 0) {
+                project.gradle.projectsEvaluated {
+                    def allReportTasks = project.getAllprojects().findResults {
+                        it.tasks.find { task ->
+                            task.name == REPORT_NAME && task instanceof ScoverageAggregate
+                        }
+                    }
+                    def aggregationTask = project.tasks.create(AGGREGATE_NAME, ScoverageAggregate) {
+                        dependsOn(allReportTasks)
+                        group = 'verification'
+                        runner = scoverageRunner
+                        reportDir = extension.reportDir
+                        sourceEncoding.set(detectedSourceEncoding)
+                        deleteReportsOnAggregation = extension.deleteReportsOnAggregation
+                        coverageOutputCobertura = extension.coverageOutputCobertura
+                        coverageOutputXML = extension.coverageOutputXML
+                        coverageOutputHTML = extension.coverageOutputHTML
+                        coverageDebug = extension.coverageDebug
+                    }
+                    project.tasks[CHECK_NAME].mustRunAfter(aggregationTask)
+                }
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2,17 +2,16 @@ plugins {`
`2`	`2`	`id 'org.scoverage' apply false`
`3`	`3`	`}`
`4`	`4`
	`5`	`+description = 'a multi-module Scala and Java project that builds successfully with 100% coverage'`
	`6`	`+`
`5`	`7`	`allprojects {`
`6`	`8`	`repositories {`
`7`	`9`	`jcenter()`
`8`	`10`	`}`
`9`	`11`	`}`
`10`	`12`
`11`		`-description = 'a multi-module Scala and Java project that builds successfully with 100% coverage'`
`12`		`-`
`13`		`-apply plugin: 'org.scoverage'`
`14`		`-`
`15`		`-allprojects {`
	`13`	`+subprojects {`
	`14`	`+ apply plugin: 'java'`
`16`	`15`
`17`	`16`	`dependencies {`
`18`	`17`	`testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: junitPlatformVersion`
`@@ -21,12 +20,9 @@ allprojects {`
`21`	`20`	`test {`
`22`	`21`	`useJUnitPlatform()`
`23`	`22`	`}`
`24`		`-`
`25`		`- scoverage {`
`26`		`- minimumRate = 0.5`
`27`		`- }`
`28`	`23`	`}`
`29`	`24`
	`25`	`+apply plugin: 'org.scoverage'`
`30`	`26`	`scoverage {`
`31`	`27`	`minimumRate = 0.5`
`32`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,3 @@`
`1`		`-apply plugin: 'java'`
`2`		`-`
`3`	`1`	`dependencies {`
`4`		`-`
`5`	`2`	`testRuntime group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVersion`
`6`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include 'a', 'b', 'common'`
	`1`	`+include 'dependencies', 'a', 'b', 'common'`