Roberto Lublinerman has submitted this change and it was merged.
Change subject: Chooses a default GWT source level to match the current
java runtime.
..
Chooses a default GWT source level to match the current java runtime.
Now the GWT default source compatibility level will try to match the
system property java.specification.version.
A small refactor in SourceLevel and a fix to apicheck have been made to
allow specifing the java source compatibility level when processing apis
in order to avoid a compile error on an old version of emul.Enum.
Change-Id: I69dc0e9b1ac0ecf9a40ee2a08d8d555319d0af6f
---
M dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
M dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java
M dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java
M dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
M dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
M dev/core/src/com/google/gwt/dev/javac/testing/GeneratorContextBuilder.java
M dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java
M dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSource.java
M dev/core/src/com/google/gwt/dev/util/arg/OptionSource.java
M dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java
M dev/core/src/com/google/gwt/util/tools/Utility.java
M dev/core/test/com/google/gwt/dev/CompilerTest.java
M dev/core/test/com/google/gwt/dev/javac/CompilationStateTestBase.java
M dev/core/test/com/google/gwt/dev/jjs/impl/JJSTestBase.java
M dev/core/test/com/google/gwt/dev/util/UtilityTest.java
M tools/api-checker/config/gwt25_26userApi.conf
M
tools/api-checker/src/com/google/gwt/tools/apichecker/ApiCompatibilityChecker.java
M tools/api-checker/src/com/google/gwt/tools/apichecker/ApiContainer.java
18 files changed, 171 insertions(+), 48 deletions(-)
Approvals:
Roberto Lublinerman: Looks good to me, approved
Leeroy Jenkins: Verified
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
b/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
index e16534f..de9e3fc 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
@@ -50,7 +50,7 @@
private int port = 9876;
private RecompileListener recompileListener = RecompileListener.NONE;
// Use the same default as the GWT compiler.
- private SourceLevel sourceLevel = OptionSource.DEFAULT_SOURCE_LEVEL;
+ private SourceLevel sourceLevel = SourceLevel.DEFAULT_SOURCE_LEVEL;
/**
* Sets each option to the appropriate value, based on command-line
arguments.
diff --git a/dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java
b/dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java
index 34cceb6..978cff9 100644
--- a/dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java
+++ b/dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java
@@ -16,7 +16,6 @@
package com.google.gwt.dev;
import com.google.gwt.core.ext.TreeLogger.Type;
-import com.google.gwt.dev.util.arg.OptionSource;
import com.google.gwt.dev.util.arg.SourceLevel;
import java.io.File;
@@ -31,7 +30,7 @@
private Type logLevel;
private final ListString moduleNames = new ArrayListString();
private File workDir;
- private SourceLevel sourceLevel = OptionSource.DEFAULT_SOURCE_LEVEL;
+ private SourceLevel sourceLevel = SourceLevel.DEFAULT_SOURCE_LEVEL;
public CompileTaskOptionsImpl() {
}
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java
b/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java
index 579275d..63016d1 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java
@@ -33,7 +33,6 @@
import com.google.gwt.dev.resource.impl.ResourceOracleImpl;
import com.google.gwt.dev.util.Empty;
import com.google.gwt.dev.util.Util;
-import com.google.gwt.dev.util.arg.OptionSource;
import com.google.gwt.dev.util.arg.SourceLevel;
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
@@ -366,7 +365,7 @@
}
public CompilationState getCompilationState(TreeLogger logger) throws
UnableToCompleteException {
-return getCompilationState(logger, false,
OptionSource.DEFAULT_SOURCE_LEVEL);
+return getCompilationState(logger, false,
SourceLevel.DEFAULT_SOURCE_LEVEL);
}
public synchronized CompilationState getCompilationState(TreeLogger
logger,
diff --git
a/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
b/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
index fc359db..d450ca7 100644
--- a/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
@@ -25,7 +25,6 @@
import com.google.gwt.dev.js.ast.JsRootScope;
import com.google.gwt.dev.resource.Resource;
