Merge pull request mvel#239 from mmelko/java-14-fix

Fix building on java 14
lemonbashar · Jun 30, 2020 · 40af6de · 40af6de
2 parents 5726f07 + 96dd6a2
commit 40af6de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -107,8 +107,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>

diff --git a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
@@ -195,7 +195,8 @@ public class ASMAccessorOptimizer extends AbstractOptimizer implements AccessorO
             || javaVersion.startsWith("9")
             || javaVersion.startsWith("10")
             || javaVersion.startsWith("11")
-            || javaVersion.startsWith("12")) {
+            || javaVersion.startsWith("12")
+            || javaVersion.startsWith("14")) {
       OPCODES_VERSION = Opcodes.V1_6;
     } else {
       OPCODES_VERSION = Opcodes.V1_2;