Remove SourceLevel.JAVA7 now that we started landing Java 8 emulations
Change-Id: I71fd679b978b5b826fc97af48521c7ca9db2e0bd
diff --git a/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java b/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
index b3fbfa3..4125092 100644
--- a/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
@@ -795,7 +795,6 @@
*/
private static final Map<SourceLevel, Long> jdtLevelByGwtLevel =
ImmutableMap.<SourceLevel, Long>of(
- SourceLevel.JAVA7, ClassFileConstants.JDK1_7,
SourceLevel.JAVA8, ClassFileConstants.JDK1_8);
public JdtCompiler(CompilerContext compilerContext, UnitProcessor processor) {
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java b/dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java
index 14d2188..89c6e0e 100644
--- a/dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java
+++ b/dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java
@@ -19,14 +19,10 @@
import com.google.gwt.util.tools.Utility;
/**
- * Java source level compatibility constants. Java versions range from 1.0 to 1.7. Versions 1.6 and
- * 1.7 are also referred as 6 and 7 respectively.
- *
- * Both names can be used indistinctly.
+ * Java source level compatibility constants.
*/
public enum SourceLevel {
// Source levels must appear in ascending order for the default setting logic to work.
- JAVA7("1.7", "7"),
JAVA8("1.8", "8");
/**
@@ -79,7 +75,7 @@
}
private static SourceLevel getJvmBestMatchingSourceLevel() {
- // If everything fails set default to JAVA7.
+ // If everything fails set default to JAVA8.
String javaSpecLevel = System.getProperty("java.specification.version");
return getBestMatchingVersion(javaSpecLevel);
}
@@ -97,10 +93,10 @@
}
}
} catch (IllegalArgumentException e) {
- // If the version can not be parsed fallback to JAVA7.
+ // If the version can not be parsed fallback to JAVA8.
}
- // If everything fails set default to JAVA7.
- return JAVA7;
+ // If everything fails set default to JAVA8.
+ return JAVA8;
}
}
diff --git a/dev/core/test/com/google/gwt/dev/CompilerTest.java b/dev/core/test/com/google/gwt/dev/CompilerTest.java
index 8ee48b2..b41cda7 100644
--- a/dev/core/test/com/google/gwt/dev/CompilerTest.java
+++ b/dev/core/test/com/google/gwt/dev/CompilerTest.java
@@ -868,7 +868,7 @@
assertProcessSuccess(argProcessor, new String[] {"-logLevel", "DEBUG", "-style",
"PRETTY", "-ea", "-gen", "myGen",
"-war", "myWar", "-workDir", "myWork", "-extra", "myExtra", "-incremental",
- "-localWorkers", "2", "-sourceLevel", "1.7", "c.g.g.h.H", "my.Module"});
+ "-localWorkers", "2", "-sourceLevel", "1.8", "c.g.g.h.H", "my.Module"});
assertEquals(new File("myGen").getAbsoluteFile(),
options.getGenDir().getAbsoluteFile());
@@ -888,7 +888,7 @@
assertTrue(options.shouldRemoveDuplicateFunctions());
assertTrue(options.isIncrementalCompileEnabled());
- assertEquals(SourceLevel.JAVA7, options.getSourceLevel());
+ assertEquals(SourceLevel.JAVA8, options.getSourceLevel());
assertEquals(2, options.getModuleNames().size());
assertEquals("c.g.g.h.H", options.getModuleNames().get(0));
@@ -948,19 +948,19 @@
}
public void testSourceLevelSelection() {
- assertEquals(SourceLevel.JAVA7, SourceLevel.getBestMatchingVersion("1.4"));
- assertEquals(SourceLevel.JAVA7, SourceLevel.getBestMatchingVersion("1.5"));
- assertEquals(SourceLevel.JAVA7, SourceLevel.getBestMatchingVersion("1.6"));
- assertEquals(SourceLevel.JAVA7, SourceLevel.getBestMatchingVersion("1.6_26"));
+ assertEquals(SourceLevel.JAVA8, SourceLevel.getBestMatchingVersion("1.4"));
+ assertEquals(SourceLevel.JAVA8, SourceLevel.getBestMatchingVersion("1.5"));
+ assertEquals(SourceLevel.JAVA8, SourceLevel.getBestMatchingVersion("1.6"));
+ assertEquals(SourceLevel.JAVA8, SourceLevel.getBestMatchingVersion("1.6_26"));
- assertEquals(SourceLevel.JAVA7, SourceLevel.getBestMatchingVersion("1.7"));
+ assertEquals(SourceLevel.JAVA8, SourceLevel.getBestMatchingVersion("1.7"));
assertEquals(SourceLevel.JAVA8, SourceLevel.getBestMatchingVersion("1.8"));
assertEquals(SourceLevel.JAVA8, SourceLevel.getBestMatchingVersion("1.9"));
- // not proper version strings => default to JAVA7.
- assertEquals(SourceLevel.JAVA7, SourceLevel.getBestMatchingVersion("1.6u3"));
- assertEquals(SourceLevel.JAVA7, SourceLevel.getBestMatchingVersion("1.6b3"));
- assertEquals(SourceLevel.JAVA7, SourceLevel.getBestMatchingVersion("1.7b3"));
+ // not proper version strings => default to JAVA8.
+ assertEquals(SourceLevel.JAVA8, SourceLevel.getBestMatchingVersion("1.6u3"));
+ assertEquals(SourceLevel.JAVA8, SourceLevel.getBestMatchingVersion("1.6b3"));
+ assertEquals(SourceLevel.JAVA8, SourceLevel.getBestMatchingVersion("1.7b3"));
}
/**
diff --git a/dev/core/test/com/google/gwt/dev/javac/Java7JdtCompilerTest.java b/dev/core/test/com/google/gwt/dev/javac/Java7JdtCompilerTest.java
index 96b3b5d..557ea8b 100644
--- a/dev/core/test/com/google/gwt/dev/javac/Java7JdtCompilerTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/Java7JdtCompilerTest.java
@@ -50,7 +50,7 @@
@Override
protected SourceLevel getSourceLevel() {
- // Always compile this tests as Java 7.
- return SourceLevel.JAVA7;
+ // Always compile this tests as Java 8.
+ return SourceLevel.JAVA8;
}
}
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/Java7AstTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/Java7AstTest.java
index ae9de11..25c5bfc 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/Java7AstTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/Java7AstTest.java
@@ -30,7 +30,7 @@
// of nodes.
@Override
public void setUp() {
- sourceLevel = SourceLevel.JAVA7;
+ sourceLevel = SourceLevel.JAVA8;
addAll(JavaResourceBase.AUTOCLOSEABLE, Java7MockResources.TEST_RESOURCE,
Java7MockResources.EXCEPTION1, Java7MockResources.EXCEPTION2);
}
