Merge pull request #206 from scoverage/tidyup

Tidyup
scoverage · Jun 25, 2024 · 9e6c5b3 · 9e6c5b3
2 parents 2364c64 + 46afb37
commit 9e6c5b3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/build.gradle b/build.gradle
@@ -30,6 +30,7 @@ gradlePlugin {
             id = 'org.scoverage'
             implementationClass = 'org.scoverage.ScoveragePlugin'
             displayName = 'Gradle Scoverage plugin'
+            description = 'gradle-scoverage is a Gradle plugin for calculating code coverage using Scoverage'
             tags.set(['coverage', 'scala', 'scoverage'])
         }
     }
@@ -183,6 +184,7 @@ if (project.properties.containsKey('signing.keyId')) {
     signing {
         sign publishing.publications.mavenJava
     }
+    project.tasks.publishMavenJavaPublicationToMavenRepository.inputs.files(project.tasks.signMavenJavaPublication)
 }
 
 // see https://stackoverflow.com/questions/44679007

diff --git a/src/functionalTest/java/org/scoverage/CompositeBuildTest.java b/src/functionalTest/java/org/scoverage/CompositeBuildTest.java
@@ -18,14 +18,12 @@ public CompositeBuildTest() {
         super("composite-build");
     }
 
-    @Ignore
     @Test
     public void buildComposite() {
 
         runComposite("clean", "build");
     }
 
-    @Ignore
     @Test
     public void reportComposite() {
 

diff --git a/src/main/groovy/org/scoverage/ScoveragePlugin.groovy b/src/main/groovy/org/scoverage/ScoveragePlugin.groovy
@@ -9,7 +9,6 @@ import org.gradle.api.plugins.PluginAware
 import org.gradle.api.plugins.scala.ScalaPlugin
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.TaskProvider
-import org.gradle.api.tasks.scala.ScalaCompile
 import org.gradle.api.tasks.testing.Test
 
 import java.nio.file.Files
@@ -59,6 +58,8 @@ class ScoveragePlugin implements Plugin<PluginAware> {
                 visible = false
                 transitive = true
                 description = 'Scoverage dependencies'
+                canBeResolved = true
+                canBeConsumed = false
             }
 
             project.afterEvaluate {
@@ -399,22 +400,4 @@ class ScoveragePlugin implements Plugin<PluginAware> {
         }
     }
 
-    private Set<? extends Task> recursiveDependenciesOf(Task task, boolean sameProjectOnly) {
-        def cache = sameProjectOnly ? sameProjectTaskDependencies : crossProjectTaskDependencies
-        if (!cache.containsKey(task)) {
-            def directDependencies = task.getTaskDependencies().getDependencies(task)
-            if (sameProjectOnly) {
-                directDependencies = directDependencies.findAll {
-                    it.project == task.project
-                }
-            }
-            def nestedDependencies = directDependencies.collect { recursiveDependenciesOf(it, sameProjectOnly) }.flatten()
-            def dependencies = directDependencies + nestedDependencies
-
-            cache.put(task, dependencies)
-            return dependencies
-        } else {
-            return cache.get(task)
-        }
-    }
 }