issue #76: use only dependencies on other projects

beryx · Aug 25, 2019 · 9227aa8 · 9227aa8
1 parent df08755
commit 9227aa8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/main/groovy/org/beryx/jlink/PrepareMergedJarsDirTask.groovy b/src/main/groovy/org/beryx/jlink/PrepareMergedJarsDirTask.groovy
@@ -20,6 +20,8 @@ import org.beryx.jlink.data.PrepareMergedJarsDirTaskData
 import org.beryx.jlink.impl.PrepareMergedJarsDirTaskImpl
 import org.beryx.jlink.util.JavaVersion
 import org.beryx.jlink.util.PathUtil
+import org.beryx.jlink.util.Util
+import org.gradle.api.Task
 import org.gradle.api.file.Directory
 import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.tasks.*
@@ -59,9 +61,12 @@ class PrepareMergedJarsDirTask extends BaseTask {
 
 
     PrepareMergedJarsDirTask() {
-        def jarTasks = project.rootProject.getTasksByName('jar', true).toArray()
-        dependsOn(jarTasks)
         description = 'Merges all non-modularized jars into a single module'
+        project.afterEvaluate {
+            def projects = Util.getAllDependentProjects(project) + project
+            def jarTasks = projects*.getTasksByName('jar', true).flatten() as Task[]
+            dependsOn(jarTasks)
+        }
     }
 
     @TaskAction

diff --git a/src/main/groovy/org/beryx/jlink/util/Util.groovy b/src/main/groovy/org/beryx/jlink/util/Util.groovy
@@ -24,6 +24,7 @@ import org.codehaus.groovy.runtime.IOGroovyMethods
 import org.codehaus.groovy.tools.Utilities
 import org.gradle.api.GradleException
 import org.gradle.api.Project
+import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.artifacts.ResolvedDependency
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
@@ -343,4 +344,11 @@ class Util {
         }
         null
     }
+
+    static List<Project> getAllDependentProjects(Project project) {
+        def projectDependencies = project.configurations*.dependencies*.withType(ProjectDependency).flatten() as Set<ProjectDependency>
+        List<Project> dependentProjects = projectDependencies*.dependencyProject
+        dependentProjects.each { dependentProjects += getAllDependentProjects(it) }
+        return dependentProjects.unique()
+    }
 }