Support Java 8 compat mode

Nosto · Oct 27, 2015 · 591045f · 591045f
1 parent 847cf0c
commit 591045f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/framework/lib/org.eclipse.jdt.core-3.10.0.v20140604-1726.jar b/framework/lib/org.eclipse.jdt.core-3.10.0.v20140604-1726.jar
diff --git a/framework/lib/org.eclipse.jdt.core-3.7.1.v_B76_R37x.jar b/framework/lib/org.eclipse.jdt.core-3.7.1.v_B76_R37x.jar
diff --git a/framework/src/play/classloading/ApplicationCompiler.java b/framework/src/play/classloading/ApplicationCompiler.java
@@ -55,13 +55,17 @@ public ApplicationCompiler(ApplicationClasses applicationClasses) {
             javaVersion = CompilerOptions.VERSION_1_6;
         } else if (System.getProperty("java.version").startsWith("1.7")) {
             javaVersion = CompilerOptions.VERSION_1_7;
+        } else if (System.getProperty("java.version").startsWith("1.8")) {
+            javaVersion = CompilerOptions.VERSION_1_8;
         }
         if("1.5".equals(Play.configuration.get("java.source"))) {
             javaVersion = CompilerOptions.VERSION_1_5;
         } else if("1.6".equals(Play.configuration.get("java.source"))) {
             javaVersion = CompilerOptions.VERSION_1_6;
         } else if("1.7".equals(Play.configuration.get("java.source"))) {
             javaVersion = CompilerOptions.VERSION_1_7;
+        } else if("1.8".equals(Play.configuration.get("java.source"))) {
+            javaVersion = CompilerOptions.VERSION_1_8;
         }
         this.settings.put(CompilerOptions.OPTION_Source, javaVersion);
         this.settings.put(CompilerOptions.OPTION_TargetPlatform, javaVersion);
@@ -113,6 +117,12 @@ public char[] getMainTypeName() {
         public char[][] getPackageName() {
             return packageName;
         }
+
+        @Override
+        public boolean ignoreOptionalProblems() {
+            // TODO Auto-generated method stub
+            return false;
+        }
     }
 
     /**