Moved distinct() to upper level (project dependencies)

Vertispan · May 23, 2024 · 1964519 · 1964519
1 parent 97ae186
commit 1964519
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/build-caching/src/main/java/com/vertispan/j2cl/build/task/TaskFactory.java b/build-caching/src/main/java/com/vertispan/j2cl/build/task/TaskFactory.java
@@ -67,6 +67,7 @@ protected List<Project> scope(Collection<? extends Dependency> dependencies, Dep
         return dependencies.stream()
                 .filter(d -> ((com.vertispan.j2cl.build.Dependency) d).belongsToScope(scope))
                 .map(Dependency::getProject)
+                .distinct()
                 .collect(Collectors.toUnmodifiableList());
     }
 

diff --git a/j2cl-tasks/src/main/java/com/vertispan/j2cl/build/provided/ClosureTask.java b/j2cl-tasks/src/main/java/com/vertispan/j2cl/build/provided/ClosureTask.java
@@ -163,9 +163,7 @@ public Task resolve(Project project, Config config) {
                         // Bytecode sources will include original input sources
                         // as well as generated input when the jar was built
                         input(p, OutputTypes.BYTECODE)
-                ))
-                // Removing any duplicate dependencies that would otherwise trigger unjustified duplicate paths detection in Closure
-                .distinct();
+                ));
 
         Stream<Input> jsFromJsZips = scope(project.getDependencies(), Dependency.Scope.RUNTIME)
                 .stream()