Make commons and graalvm js dependences optional for pdxu-io

crschnick · Aug 5, 2023 · 0bdcda0 · 0bdcda0
1 parent 9cc51b7
commit 0bdcda0
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 10 deletions.
diff --git a/gradle/build.gradle b/gradle/build.gradle
@@ -86,7 +86,8 @@ jlink {
                 'org.kordamp.ikonli.materialdesign',
                 'jdk.zipfs',
                 'io.github.ititus.ddsiio',
-                'jdk.accessibility'
+                'jdk.accessibility',
+                'org.graalvm.js'
         ]
     }
 

diff --git a/pdxu-app/build.gradle b/pdxu-app/build.gradle
@@ -55,6 +55,8 @@ dependencies {
     implementation project(':pdxu-io')
     implementation project(':pdxu-model')
 
+    implementation 'org.graalvm.js:js:22.3.0'
+
     implementation 'info.picocli:picocli:4.6.3'
     annotationProcessor 'info.picocli:picocli-codegen:4.6.3'
     testImplementation 'info.picocli:picocli:4.6.3'

diff --git a/pdxu-app/src/main/java/com/crschnick/pdxu/app/cli/MainCommand.java b/pdxu-app/src/main/java/com/crschnick/pdxu/app/cli/MainCommand.java
@@ -12,7 +12,7 @@
                 CommandLine.HelpCommand.class,
                 RenderCommand.class
         },
-        header = "Runsthe Pdx-Unlimiter application."
+        header = "Runs the Pdx-Unlimiter application."
 )
 class MainCommand implements Runnable {
 

diff --git a/pdxu-app/src/main/java/module-info.java b/pdxu-app/src/main/java/module-info.java
@@ -11,6 +11,7 @@
     requires javafx.media;
     requires info.picocli;
     requires com.sun.jna;
+    requires org.graalvm.js;
     requires com.sun.jna.platform;
     requires org.jnativehook;
     requires jdk.localedata;

diff --git a/pdxu-io/build.gradle b/pdxu-io/build.gradle
@@ -16,8 +16,7 @@ repositories {
 apply from: "$rootDir/gradle/module_gen.gradle"
 
 dependencies {
-    implementation 'org.graalvm.js:js:22.3.0'
+    compileOnly 'org.graalvm.js:js:22.3.0'
     compileOnly 'org.projectlombok:lombok:1.18.22'
     annotationProcessor 'org.projectlombok:lombok:1.18.22'
-    compileOnly files("$project.buildDir/generated-modules/commons-lang3-3.12.0.jar")
 }
diff --git a/pdxu-io/src/main/java/com/crschnick/pdxu/io/node/NodeEvaluator.java b/pdxu-io/src/main/java/com/crschnick/pdxu/io/node/NodeEvaluator.java
@@ -10,7 +10,7 @@
 
 public class NodeEvaluator {
 
-    private static final Context JAVASCRIPT_CONTEXT = Context.newBuilder("js").option("engine.WarnInterpreterOnly", "false").build();
+    private static Context JAVASCRIPT_CONTEXT;
     private static final NumberFormat FORMATTER = new DecimalFormat("#0.0000000");
 
     public static void evaluateArrayNode(ArrayNode arrayNode) {
@@ -39,6 +39,14 @@ public static void evaluateArrayNode(ArrayNode arrayNode, NodeEnvironment enviro
     }
 
     public static Node evaluateValueNode(ValueNode node, NodeEnvironment environment) {
+        if (ModuleLayer.boot().findModule("org.graalvm.js").isEmpty()) {
+            throw new UnsupportedOperationException("Node evaluation is only supported with module org.graalvm.js in module path");
+        }
+
+        if (JAVASCRIPT_CONTEXT == null) {
+            JAVASCRIPT_CONTEXT = Context.newBuilder("js").option("engine.WarnInterpreterOnly", "false").build();
+        }
+
         var expression = node.getInlineMathExpression();
         if (expression.isPresent()) {
             var string = expression.get();

diff --git a/pdxu-io/src/main/java/com/crschnick/pdxu/io/parser/TextFormatParser.java b/pdxu-io/src/main/java/com/crschnick/pdxu/io/parser/TextFormatParser.java
@@ -1,7 +1,6 @@
 package com.crschnick.pdxu.io.parser;
 
 import com.crschnick.pdxu.io.node.*;
-import org.apache.commons.lang3.SystemUtils;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -11,6 +10,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import java.util.function.Predicate;
 
 public final class TextFormatParser {
@@ -56,18 +56,23 @@ public static TextFormatParser stellaris() {
 
     public static TextFormatParser ck2() {
         return new TextFormatParser(
-                SystemUtils.IS_OS_MAC ? StandardCharsets.UTF_8 : Charset.forName("windows-1252"),
+                isMacOs() ? StandardCharsets.UTF_8 : Charset.forName("windows-1252"),
                 TaggedNode.NO_TAGS,
                 s -> false);
     }
 
     public static TextFormatParser vic2() {
         return new TextFormatParser(
-                SystemUtils.IS_OS_MAC ? StandardCharsets.UTF_8 : Charset.forName("windows-1252"),
+                isMacOs() ? StandardCharsets.UTF_8 : Charset.forName("windows-1252"),
                 TaggedNode.NO_TAGS,
                 s -> false);
     }
 
+    private static boolean isMacOs() {
+        String osName = System.getProperty("os.name", "generic").toLowerCase(Locale.ENGLISH);
+        return osName.contains("mac") || osName.contains("darwin");
+    }
+
     private final Charset charset;
     private final TaggedNode.TagType[] possibleTags;
     private final Predicate<String> keyWithoutEquals;

diff --git a/pdxu-io/src/main/java/module-info.java b/pdxu-io/src/main/java/module-info.java
@@ -3,7 +3,6 @@
     exports com.crschnick.pdxu.io.savegame;
     exports com.crschnick.pdxu.io.node;
 
-    requires org.apache.commons.lang;
-    requires org.graalvm.js;
+    requires static org.graalvm.js;
     requires static lombok;
 }