Check entire project tree during dependency adjustment.

raphw · Oct 6, 2020 · 0a8b2a6 · 0a8b2a6
1 parent 6a16a9e
commit 0a8b2a6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...e-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTaskConfiguration.java b/...e-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTaskConfiguration.java
@@ -85,11 +85,13 @@ public void execute(Project project) {
             byteBuddyTask.dependsOn(compileTask);
             extension.configure(byteBuddyTask);
             configureDirectories(sourceSet.getJava(), compileTask, byteBuddyTask);
-            for (Map.Entry<Project, Set<Task>> entry : project.getAllTasks(true).entrySet()) {
+            for (Map.Entry<Project, Set<Task>> entry : project.getRootProject().getAllTasks(true).entrySet()) {
                 for (Task task : entry.getValue()) {
-                    if (!task.getName().equals(name) && task.getDependsOn().contains(compileTask.getName())) {
+                    if (!(task.getName().equals(name)
+                            && task.getProject().equals(project))
+                            && task.getTaskDependencies().getDependencies(task).contains(compileTask)) {
                         task.dependsOn(byteBuddyTask);
-                        project.getLogger().warn("Altered task '{}' of project '{}' to depend on '{}' of project '{}'",
+                        project.getLogger().debug("Altered task '{}' of project '{}' to depend on '{}' of project '{}'",
                                 task.getName(),
                                 entry.getKey().getName(),
                                 name,

diff --git a/...dy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/ByteBuddyTaskConfiguration.java b/...dy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/ByteBuddyTaskConfiguration.java
@@ -68,7 +68,6 @@ protected void configureDirectories(SourceDirectorySet source, JavaCompile compi
         }
     }
 
-
     /**
      * Transforms a directory to a file.
      */