Fixed: j2cl java time wrongly attached to server modules

webfx-project · Mar 24, 2024 · c65bc93 · c65bc93
1 parent d4f975b
commit c65bc93
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/dev/webfx/cli/core/Target.java b/src/main/java/dev/webfx/cli/core/Target.java
@@ -2,7 +2,9 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author Bruno Salmon
@@ -25,7 +27,12 @@ public Target(TargetTag... tags) {
     private Target(ProjectModule module, TargetTag[] tags) {
         this.module = module;
         this.tags = Arrays.stream(tags).collect(Collectors.toUnmodifiableList());
-        platformTags = this.tags.stream().filter(TargetTag::isPlatformTag).collect(Collectors.toUnmodifiableList());
+        platformTags = this.tags.stream()
+                // filtering platform tags (ex: GWT, JRE, GLUON, VERTX, ...) from this tag and transitive implied tags (ex: SERVER => JRE)
+                .flatMap(tag -> Stream.concat(Stream.of(tag), Stream.of(tag.getTransitiveImpliedTags())))
+                .filter(Objects::nonNull)
+                .filter(TargetTag::isPlatformTag)
+                .collect(Collectors.toUnmodifiableList());
     }
 
     ProjectModule getModule() {

diff --git a/src/main/resources/dev/webfx/cli/version/dev/version.ini b/src/main/resources/dev/webfx/cli/version/dev/version.ini
@@ -1,2 +1,2 @@
 version=0.1.0-SNAPSHOT
-build.timestamp=2024-03-24 10:52
+build.timestamp=2024-03-24 11:44