From b2383019225522e566fc549c69dfd1dcc0f2306d Mon Sep 17 00:00:00 2001 From: Stu Date: Sat, 24 Jun 2023 14:24:14 +0100 Subject: [PATCH 1/4] fix publishing issues --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index c411888..85cff81 100644 --- 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 From ffea9fdac0fb526b10414951fb60f02ecd95f98e Mon Sep 17 00:00:00 2001 From: Stu Date: Mon, 4 Sep 2023 23:12:59 +0100 Subject: [PATCH 2/4] remove unused code --- .../org/scoverage/ScoveragePlugin.groovy | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/main/groovy/org/scoverage/ScoveragePlugin.groovy b/src/main/groovy/org/scoverage/ScoveragePlugin.groovy index 8fc8b2c..27b952f 100644 --- 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 @@ -399,22 +398,4 @@ class ScoveragePlugin implements Plugin { } } - private Set 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) - } - } } From 007334f56d68d550728df36c7c8b83b6a25f30dd Mon Sep 17 00:00:00 2001 From: Stu Date: Mon, 4 Sep 2023 23:13:27 +0100 Subject: [PATCH 3/4] mark the scoverage configuration as resolvable but not consumable --- src/main/groovy/org/scoverage/ScoveragePlugin.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/groovy/org/scoverage/ScoveragePlugin.groovy b/src/main/groovy/org/scoverage/ScoveragePlugin.groovy index 27b952f..a6a33d2 100644 --- a/src/main/groovy/org/scoverage/ScoveragePlugin.groovy +++ b/src/main/groovy/org/scoverage/ScoveragePlugin.groovy @@ -58,6 +58,8 @@ class ScoveragePlugin implements Plugin { visible = false transitive = true description = 'Scoverage dependencies' + canBeResolved = true + canBeConsumed = false } project.afterEvaluate { From 46afb37beea74337b9b2cd3e3203d3ecb3d5d4c3 Mon Sep 17 00:00:00 2001 From: Stu Date: Tue, 25 Jun 2024 21:50:09 +0100 Subject: [PATCH 4/4] enable skipped test --- src/functionalTest/java/org/scoverage/CompositeBuildTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/functionalTest/java/org/scoverage/CompositeBuildTest.java b/src/functionalTest/java/org/scoverage/CompositeBuildTest.java index 21a5c6d..4bd4bb7 100644 --- 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() {