Skip to content

Tidyup #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 25, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions src/functionalTest/java/org/scoverage/CompositeBuildTest.java
Original file line number Diff line number Diff line change
@@ -18,14 +18,12 @@ public CompositeBuildTest() {
super("composite-build");
}

@Ignore
@Test
public void buildComposite() {

runComposite("clean", "build");
}

@Ignore
@Test
public void reportComposite() {

21 changes: 2 additions & 19 deletions src/main/groovy/org/scoverage/ScoveragePlugin.groovy
Original file line number Diff line number Diff line change
@@ -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)
}
}
}