minimal changes to move to java 11 and latest graal #2083 #2148

karatelabs · Nov 3, 2022 · 87c06dc · 87c06dc
1 parent 94cd36d
commit 87c06dc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
@@ -15,11 +15,11 @@ jobs:
     steps:
     - name: git checkout
       uses: actions/checkout@v3
-    - name: set up jdk 8
+    - name: set up jdk 11
       uses: actions/setup-java@v3
       with:
         distribution: adopt
-        java-version: 8
+        java-version: 11
         server-id: ossrh
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD

diff --git a/karate-core/pom.xml b/karate-core/pom.xml
@@ -12,7 +12,7 @@
 
     <properties>
         <antlr.version>4.9.3</antlr.version>
-        <graal.version>22.0.0.2</graal.version>
+        <graal.version>22.3.0</graal.version>
     </properties>
 
     <dependencies>

diff --git a/karate-core/src/main/java/com/intuit/karate/graal/JsEngine.java b/karate-core/src/main/java/com/intuit/karate/graal/JsEngine.java
@@ -49,7 +49,7 @@ public class JsEngine {
     private static final Logger logger = LoggerFactory.getLogger(JsEngine.class);
 
     private static final String JS = "js";
-    private static final String JS_EXPERIMENTAL_FOP = "js.experimental-foreign-object-prototype";
+    private static final String JS_FOREIGN_OBJECT_PROTOTYPE = "js.foreign-object-prototype";
     private static final String JS_NASHORN_COMPAT = "js.nashorn-compat";
     private static final String JS_ECMASCRIPT_VERSION = "js.ecmascript-version";
     private static final String ENGINE_WARN_INTERPRETER_ONLY = "engine.WarnInterpreterOnly";
@@ -75,7 +75,7 @@ private static Context createContext(Engine engine) {
                 .allowAllAccess(true)
                 .option(JS_NASHORN_COMPAT, TRUE)
                 .option(JS_ECMASCRIPT_VERSION, V_2021)
-                .option(JS_EXPERIMENTAL_FOP, TRUE)
+                .option(JS_FOREIGN_OBJECT_PROTOTYPE, TRUE)
                 .engine(engine).build();
     }
 

diff --git a/karate-core/src/test/java/com/intuit/karate/graal/JsEngineTest.java b/karate-core/src/test/java/com/intuit/karate/graal/JsEngineTest.java
@@ -124,7 +124,7 @@ void testJavaStaticMethod() {
     void testJsNestedArraysToJava() {
         je.eval("var StaticPojo = Java.type('com.intuit.karate.graal.StaticPojo')");
         JsValue sp = je.eval("StaticPojo.convert({foo:[{a:1}]})");
-        assertEquals("{\"foo\":{}}", sp.getAsString()); // bug fixed in graal 22.1
+        assertEquals("{\"foo\":[{\"a\":1}]}", sp.getAsString()); // bug fixed in graal 22.1
     }
 
     @Test

diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <maven.compiler.version>3.8.1</maven.compiler.version>
         <maven.surefire.version>2.22.2</maven.surefire.version>
         <maven.shade.version>3.2.4</maven.shade.version>