step three

treblereel · Apr 11, 2024 · 6358622 · 6358622
1 parent 57d6d91
commit 6358622
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/j2cl-tasks/src/main/java/com/vertispan/j2cl/build/provided/BytecodeTask.java b/j2cl-tasks/src/main/java/com/vertispan/j2cl/build/provided/BytecodeTask.java
@@ -87,7 +87,7 @@ public Task resolve(Project project, Config config) {
 
         List<Input> bytecodeClasspath = scope(project.getDependencies()
                         .stream()
-                        .filter(p -> p.getProject().getJar() == null || p.getProject().hasSourcesMapped())
+                        //.filter(p -> p.getProject().getJar() == null || p.getProject().hasSourcesMapped())
                         .filter(dependency -> dependency.getProject().getProcessors().isEmpty()).collect(Collectors.toSet()),
                 com.vertispan.j2cl.build.task.Dependency.Scope.COMPILE)
                 .stream()
@@ -126,15 +126,16 @@ public Task resolve(Project project, Config config) {
             if (!inputSources.getFilesAndHashes().isEmpty()) {
                 // At least one .java file in sources, compile it (otherwise skip this and just copy resource)
 
-                List<File> classpathDirs = Stream.concat(
+                List<File> classpathDirs = //Stream.concat(
                         Stream.concat(
                                 bytecodeClasspath.stream().map(Input::getParentPaths).flatMap(Collection::stream).map(Path::toFile),
-                                extraClasspath.stream()),
+                                extraClasspath.stream()
+/*                        ,
                         project.getDependencies()
                                 .stream()
                                 .filter(p -> !p.getProject().hasSourcesMapped())
                                 .filter(p -> p.getProject().getJar() != null)
-                                .map(p -> p.getProject().getJar())
+                                .map(p -> p.getProject().getJar())*/
                 ).collect(Collectors.toUnmodifiableList());
 
                 List<File> sourcePaths = inputDirs.getParentPaths().stream().map(Path::toFile).collect(Collectors.toUnmodifiableList());