Proper support for OpenJDK 12.
This commit is contained in:
@ -30,9 +30,9 @@ import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.openjavac.tools.Diagnostic;
|
||||
import org.openjavac.tools.DiagnosticCollector;
|
||||
import org.openjavac.tools.JavaFileObject;
|
||||
import javax.tools.Diagnostic;
|
||||
import javax.tools.DiagnosticCollector;
|
||||
import javax.tools.JavaFileObject;
|
||||
|
||||
import org.l2jmobius.gameserver.scripting.annotations.Disabled;
|
||||
|
||||
|
@ -23,8 +23,8 @@ import java.util.Map.Entry;
|
||||
import java.util.Properties;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import org.openjavac.tools.JavaCompiler;
|
||||
import org.openjavac.tools.javac.api.JavacTool;
|
||||
import javax.tools.JavaCompiler;
|
||||
import javax.tools.ToolProvider;
|
||||
|
||||
/**
|
||||
* @author Mobius
|
||||
@ -34,7 +34,7 @@ public class JavaScriptingEngine
|
||||
private static final Logger LOGGER = Logger.getLogger(JavaScriptingEngine.class.getName());
|
||||
|
||||
private final static Map<String, String> _properties = new HashMap<>();
|
||||
private final static JavaCompiler _compiler = JavacTool.create();
|
||||
private final static JavaCompiler _compiler = ToolProvider.getSystemJavaCompiler();
|
||||
|
||||
public JavaScriptingEngine()
|
||||
{
|
||||
|
@ -24,10 +24,10 @@ import java.util.Iterator;
|
||||
import java.util.LinkedList;
|
||||
import java.util.Set;
|
||||
|
||||
import org.openjavac.tools.FileObject;
|
||||
import org.openjavac.tools.JavaFileObject;
|
||||
import org.openjavac.tools.JavaFileObject.Kind;
|
||||
import org.openjavac.tools.StandardJavaFileManager;
|
||||
import javax.tools.FileObject;
|
||||
import javax.tools.JavaFileObject;
|
||||
import javax.tools.JavaFileObject.Kind;
|
||||
import javax.tools.StandardJavaFileManager;
|
||||
|
||||
/**
|
||||
* @author HorridoJoho
|
||||
|
@ -26,8 +26,7 @@ import java.nio.file.Path;
|
||||
|
||||
import javax.lang.model.element.Modifier;
|
||||
import javax.lang.model.element.NestingKind;
|
||||
|
||||
import org.openjavac.tools.JavaFileObject;
|
||||
import javax.tools.JavaFileObject;
|
||||
|
||||
/**
|
||||
* @author HorridoJoho
|
||||
|
Reference in New Issue
Block a user