Fixed j2cl compilation issues

webfx-project · Mar 17, 2024 · f315cf6 · f315cf6
1 parent 0210bb6
commit f315cf6
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,7 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <configuration>
-                        <skippedModules>webfx-kit-javafxweb-registry,webfx-kit-javafxweb-registry-gwt</skippedModules>
+                        <skippedModules>webfx-kit-javafxweb-registry,webfx-kit-javafxweb-registry-gwt-j2cl,webfx-kit-javafxgraphics-fat-j2cl</skippedModules>
                     </configuration>
                 </plugin>
             </plugins>

diff --git a/webfx-kit/webfx-kit-javafxbase-emul/pom.xml b/webfx-kit/webfx-kit-javafxbase-emul/pom.xml
@@ -20,6 +20,7 @@
             <artifactId>webfx-platform-javabase-emul-j2cl</artifactId>
             <version>0.1.0-SNAPSHOT</version>
             <scope>runtime</scope>
+            <optional>true</optional>
         </dependency>
 
     </dependencies>

diff --git a/webfx-kit/webfx-kit-javafxcontrols-emul/pom.xml b/webfx-kit/webfx-kit-javafxcontrols-emul/pom.xml
@@ -51,13 +51,15 @@
             <artifactId>webfx-platform-javabase-emul-j2cl</artifactId>
             <version>0.1.0-SNAPSHOT</version>
             <scope>runtime</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>dev.webfx</groupId>
             <artifactId>webfx-platform-javatime-emul-j2cl</artifactId>
-            <version>${webfx.version}</version>
+            <version>0.1.0-SNAPSHOT</version>
             <scope>runtime</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>

diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-base/src/main/java/module-info.java b/webfx-kit/webfx-kit-javafxcontrols-peers-base/src/main/java/module-info.java
@@ -3,7 +3,6 @@
 module webfx.kit.javafxcontrols.peers.base {
 
     // Direct dependencies modules
-    requires java.base;
     requires javafx.base;
     requires javafx.controls;
     requires javafx.graphics;

diff --git a/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/module-info.java b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/module-info.java
@@ -3,7 +3,6 @@
 module webfx.kit.javafxgraphics.openjfx {
 
     // Direct dependencies modules
-    requires java.base;
     requires javafx.base;
     requires javafx.controls;
     requires javafx.graphics;

diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-base/src/main/java/module-info.java b/webfx-kit/webfx-kit-javafxgraphics-peers-base/src/main/java/module-info.java
@@ -3,7 +3,6 @@
 module webfx.kit.javafxgraphics.peers.base {
 
     // Direct dependencies modules
-    requires java.base;
     requires javafx.base;
     requires javafx.graphics;
     requires webfx.kit.javafxgraphics.peers;

diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers/src/main/java/module-info.java b/webfx-kit/webfx-kit-javafxgraphics-peers/src/main/java/module-info.java
@@ -3,7 +3,6 @@
 module webfx.kit.javafxgraphics.peers {
 
     // Direct dependencies modules
-    requires java.base;
     requires javafx.base;
     requires javafx.graphics;
     requires webfx.platform.console;

diff --git a/webfx-kit/webfx-kit-javafxmedia-emul/pom.xml b/webfx-kit/webfx-kit-javafxmedia-emul/pom.xml
@@ -39,6 +39,7 @@
             <artifactId>webfx-platform-javabase-emul-j2cl</artifactId>
             <version>0.1.0-SNAPSHOT</version>
             <scope>runtime</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>

diff --git a/webfx-kit/webfx-kit-javafxmedia-gluon/src/main/java/module-info.java b/webfx-kit/webfx-kit-javafxmedia-gluon/src/main/java/module-info.java
@@ -4,7 +4,6 @@
 
     // Direct dependencies modules
     requires com.gluonhq.attach.storage;
-    requires java.base;
     requires javafx.base;
     requires webfx.platform.audio;
     requires webfx.platform.console;

diff --git a/webfx-kit/webfx-kit-javafxweb-registry-gwt-j2cl/pom.xml b/webfx-kit/webfx-kit-javafxweb-registry-gwt-j2cl/pom.xml
@@ -72,6 +72,14 @@
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>dev.webfx</groupId>
+            <artifactId>webfx-platform-javabase-emul-j2cl</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>dev.webfx</groupId>
             <artifactId>webfx-platform-scheduler</artifactId>

diff --git a/webfx-kit/webfx-kit-launcher/src/main/java/module-info.java b/webfx-kit/webfx-kit-launcher/src/main/java/module-info.java
@@ -3,7 +3,6 @@
 module webfx.kit.launcher {
 
     // Direct dependencies modules
-    requires java.base;
     requires javafx.base;
     requires javafx.graphics;
     requires webfx.platform.boot;

diff --git a/webfx-kit/webfx-kit-statusbar/pom.xml b/webfx-kit/webfx-kit-statusbar/pom.xml
@@ -26,6 +26,7 @@
             <artifactId>webfx-platform-javabase-emul-j2cl</artifactId>
             <version>0.1.0-SNAPSHOT</version>
             <scope>runtime</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>

diff --git a/webfx-kit/webfx-kit-statusbar/src/main/java/module-info.java b/webfx-kit/webfx-kit-statusbar/src/main/java/module-info.java
@@ -3,7 +3,6 @@
 module webfx.kit.statusbar {
 
     // Direct dependencies modules
-    requires java.base;
     requires javafx.graphics;
     requires webfx.platform.util;
 

diff --git a/webfx-kit/webfx-kit-util-scene/src/main/java/module-info.java b/webfx-kit/webfx-kit-util-scene/src/main/java/module-info.java
@@ -3,7 +3,6 @@
 module webfx.kit.util.scene {
 
     // Direct dependencies modules
-    requires java.base;
     requires javafx.base;
     requires javafx.graphics;
     requires webfx.kit.launcher;

diff --git a/webfx-kit/webfx-kit-util/src/main/java/module-info.java b/webfx-kit/webfx-kit-util/src/main/java/module-info.java
@@ -3,7 +3,6 @@
 module webfx.kit.util {
 
     // Direct dependencies modules
-    requires java.base;
     requires javafx.base;
     requires transitive webfx.platform.util;
 

diff --git a/webfx-kit/webfx-kit-webgl/pom.xml b/webfx-kit/webfx-kit-webgl/pom.xml
@@ -32,6 +32,7 @@
             <artifactId>webfx-platform-javabase-emul-j2cl</artifactId>
             <version>0.1.0-SNAPSHOT</version>
             <scope>runtime</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>

diff --git a/webfx-kit/webfx-kit-webgl/src/main/java/module-info.java b/webfx-kit/webfx-kit-webgl/src/main/java/module-info.java
@@ -3,7 +3,6 @@
 module webfx.kit.webgl {
 
     // Direct dependencies modules
-    requires java.base;
     requires javafx.graphics;
     requires javafx.media;
     requires webfx.platform.typedarray;