diff options
Diffstat (limited to 'ajde.core')
3 files changed, 11 insertions, 9 deletions
diff --git a/ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java b/ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java index 8ebaa664d..b51f6c025 100644 --- a/ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java +++ b/ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java @@ -28,6 +28,8 @@ public final class JavaOptions { public static final String VERSION_14 = CompilerOptions.VERSION_1_4; public static final String VERSION_15 = CompilerOptions.VERSION_1_5; public static final String VERSION_16 = CompilerOptions.VERSION_1_6; + public static final String VERSION_17 = CompilerOptions.VERSION_1_7; + public static final String VERSION_18 = CompilerOptions.VERSION_1_8; // by default will use the platform default encoding public static final String CHARACTER_ENCODING = CompilerOptions.OPTION_Encoding; diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java b/ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java index c7a63b5ba..b181aea5f 100644 --- a/ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java +++ b/ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java @@ -77,8 +77,8 @@ public class TestCompilerConfiguration implements ICompilerConfiguration { public Map<String, String> getJavaOptionsMap() { if (javaOptions == null) { javaOptions = new Hashtable<>(); - javaOptions.put(JavaOptions.COMPLIANCE_LEVEL, JavaOptions.VERSION_13); - javaOptions.put(JavaOptions.SOURCE_COMPATIBILITY_LEVEL, JavaOptions.VERSION_13); + javaOptions.put(JavaOptions.COMPLIANCE_LEVEL, JavaOptions.VERSION_18); + javaOptions.put(JavaOptions.SOURCE_COMPATIBILITY_LEVEL, JavaOptions.VERSION_18); } return javaOptions; } diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java index 563f08666..5b1ecf78b 100644 --- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java +++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java @@ -166,8 +166,8 @@ public class ShowWeaveMessagesTest extends AjdeCoreTestCase { if (debugTests) System.out.println("\ntestWeaveMessagesDeclareAnnotation: Building with Six.lst"); compilerConfig.setProjectSourceFiles(getSourceFileList(six)); - setRunIn15Mode(); - compilerConfig.setNonStandardOptions("-showWeaveInfo -1.5"); + setRunIn18Mode(); + compilerConfig.setNonStandardOptions("-showWeaveInfo -1.8"); doBuild(); assertTrue("Expected no compiler errors but found " + handler.getErrors(), handler.getErrors().isEmpty()); verifyWeavingMessages("declare.annotation", true); @@ -182,7 +182,7 @@ public class ShowWeaveMessagesTest extends AjdeCoreTestCase { System.out.println("\ntestWeaveMessagesDeclareAnnotation: Building with Seven.lst"); compilerConfig.setProjectSourceFiles(getSourceFileList(seven)); compilerConfig.setNonStandardOptions(""); - setRunIn15Mode(); + setRunIn18Mode(); doBuild(); assertTrue("Expected no compiler errors but found " + handler.getErrors(), handler.getErrors().isEmpty()); verifyWeavingMessages("declare.annotationNoWeaveInfo", true); @@ -423,11 +423,11 @@ public class ShowWeaveMessagesTest extends AjdeCoreTestCase { } } - private void setRunIn15Mode() { + private void setRunIn18Mode() { Map<String, String> m = new Hashtable<>(); - m.put(JavaOptions.COMPLIANCE_LEVEL, JavaOptions.VERSION_15); - m.put(JavaOptions.SOURCE_COMPATIBILITY_LEVEL, JavaOptions.VERSION_15); - m.put(JavaOptions.TARGET_COMPATIBILITY_LEVEL, JavaOptions.VERSION_15); + m.put(JavaOptions.COMPLIANCE_LEVEL, JavaOptions.VERSION_18); + m.put(JavaOptions.SOURCE_COMPATIBILITY_LEVEL, JavaOptions.VERSION_18); + m.put(JavaOptions.TARGET_COMPATIBILITY_LEVEL, JavaOptions.VERSION_18); compilerConfig.setJavaOptions(m); } |