Merge pull request #998 from TNG/fix/release-issues

Fix fixing the fix
TNG · Oct 13, 2022 · 9dc019d · 9dc019d
2 parents dd18b30 + 3804c76
commit 9dc019d
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/jgiven-maven-plugin/build.gradle b/jgiven-maven-plugin/build.gradle
@@ -21,28 +21,25 @@ task generatePom(type: Copy, dependsOn: copyClasses) {
     }
 }
 
-task generateMavenPlugin(type: CrossPlatformExec, dependsOn: generatePom){
+Set<Task> findPublishTask(String projectName){
+    project.rootProject.findProject(projectName).getTasks().findAll {it instanceof PublishToMavenLocal}
+}
+
+task generateMavenPlugin(type: CrossPlatformExec, dependsOn: [generatePom, findPublishTask("jgiven-core"), findPublishTask("jgiven-html5-report")]){
     // currenlty it seems to be the more or less only clean solution
     // to generate a plugin.xml file to use maven directly
     // if anyone has a better solution please let us know!
     buildCommand 'mvn', '-nsu', '-U', '-f', 'build/maven/pom.xml', 'plugin:descriptor'
 }
 
-Set<Task> findPublishTask(String projectName){
-    rootProject.findProject(projectName).getTasks().findAll {it instanceof PublishToMavenLocal}
-}
-
 generateMavenPlugin.onlyIf {
    // as the generateMavenPlugin task requires mvn, it is only executed
    // when actually uploading the archives
    // that way the standard build stays maven-free
-    boolean shallGeneratePlugin = gradle.taskGraph.getAllTasks().any{it instanceof AbstractPublishToMaven}
-    if(shallGeneratePlugin){
-       generateMavenPlugin.dependsOn += findPublishTask("jgiven-core")
-       generateMavenPlugin.dependsOn += findPublishTask("jgiven-html5-report")
-    }
-    return shallGeneratePlugin
-
+   gradle.taskGraph.getAllTasks()
+           .findAll{task -> !findPublishTask("jgiven-core").contains(task)}
+           .findAll{ task -> !findPublishTask("jgiven-html5-report").contains(task) }
+           .any{it instanceof AbstractPublishToMaven}
 }
 
 task copyMavenPlugin(type: Copy, dependsOn: generateMavenPlugin) {