Skip to content

Align programmatic Java-level config with the Java 21 baseline #3780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
szarnekow wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Align programmatic Java-level config with the Java 21 baseline #3780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0985d36
Align programmatic Java-level config with the Java 21 baseline
szarnekow Aug 23, 2026
4104c27
Fix testMethodModifiers after raising the default compile target to 21
szarnekow Aug 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions org.eclipse.xtend.core.tests/src/org/eclipse/xtend/core/tests/macro/Bug467063Test.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import org.junit.Test
import org.eclipse.xtend.lib.macro.declaration.MutableClassDeclaration
import org.eclipse.xtend.lib.macro.TransformationContext
import org.eclipse.xtend.lib.macro.declaration.MutableInterfaceDeclaration
import org.eclipse.xtext.util.JavaVersion

/**
* @author Christian Dietrich - Initial contribution and API
Expand Down Expand Up @@ -49,7 +48,7 @@ class Bug467063Test extends AbstractActiveAnnotationTest {
}
}

''', JavaVersion.JAVA8)
''')
}

}
Expand Down
3 changes: 1 addition & 2 deletions org.eclipse.xtend.core.tests/xtend-gen/org/eclipse/xtend/core/tests/macro/Bug467063Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
package org.eclipse.xtend.core.tests.macro;

import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.util.JavaVersion;
import org.junit.Test;

/**
Expand Down Expand Up @@ -63,6 +62,6 @@ public void testAddInterfaceWithDefaultMethod() {
_builder_1.append("}");
_builder_1.newLine();
_builder_1.newLine();
this._xtendCompilerTester.assertCompilesTo(_builder, _builder_1, JavaVersion.JAVA8);
this._xtendCompilerTester.assertCompilesTo(_builder, _builder_1);
}
}
3 changes: 1 addition & 2 deletions ...nd.ide.tests/longrunning/src/org/eclipse/xtend/ide/tests/builder/SameClassNamesTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import org.eclipse.xtext.ui.testing.util.JavaProjectSetupUtil
import org.eclipse.xtext.ui.XtextProjectHelper
import org.eclipse.xtext.ui.util.JREContainerProvider
import org.eclipse.xtext.ui.util.PluginProjectFactory
import org.eclipse.xtext.util.JavaVersion
import org.junit.After
import org.junit.Before
import org.junit.Test
Expand Down Expand Up @@ -127,7 +126,7 @@ class SameClassNamesTest extends AbstractXtendUITestCase {
projectFactory.addExportedPackages(#['com.acme'])
val result = projectFactory.createProject(new NullProgressMonitor(), null);
val javaProject = JavaCore.create(result);
WorkbenchTestHelper.makeCompliantFor(javaProject, JavaVersion.JAVA8);
JavaProjectSetupUtil.makeDefaultCompliant(javaProject);
JavaProjectSetupUtil.addJreClasspathEntry(javaProject);
return result;
}
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/WorkbenchTestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ public static IProject createPluginProject(String name, JavaVersion javaVersion,
IProject result = projectFactory.createProject(new NullProgressMonitor(), null);
IJavaProject javaProject = JavaCore.create(result);
if (javaVersion == null)
JavaProjectSetupUtil.makeJava8Compliant(javaProject);
JavaProjectSetupUtil.makeDefaultCompliant(javaProject);
else
makeCompliantFor(javaProject, javaVersion);
JavaProjectSetupUtil.addJreClasspathEntry(javaProject);
Expand Down
6 changes: 3 additions & 3 deletions ...xtend.ide.tests/src/org/eclipse/xtend/ide/tests/buildpath/XtendLibClasspathAdderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public void testAddToJavaProject() throws Exception {
javaProjectFactory.addProjectNatures(JavaCore.NATURE_ID, XtextProjectHelper.NATURE_ID);
IProject project = javaProjectFactory.createProject(null, null);
IJavaProject javaProject = JavaCore.create(project);
JavaProjectSetupUtil.makeJava8Compliant(javaProject);
JavaProjectSetupUtil.makeDefaultCompliant(javaProject);
IFile file = project.getFile("src/Foo.xtend");
file.create(new StringInputStream("import org.eclipse.xtend.lib.annotations.Accessors class Foo { @Accessors int bar }"),
true, null);
Expand All @@ -90,7 +90,7 @@ public void testAddToPlugin() throws Exception {
XtextProjectHelper.NATURE_ID);
IProject project = pluginProjectFactory.createProject(null, null);
IJavaProject javaProject = JavaCore.create(project);
JavaProjectSetupUtil.makeJava8Compliant(javaProject);
JavaProjectSetupUtil.makeDefaultCompliant(javaProject);
IFile file = project.getFile("src/Foo.xtend");
file.create(new StringInputStream("import org.eclipse.xtend.lib.annotations.Accessors class Foo { @Accessors int bar }"),
true, null);
Expand All @@ -111,7 +111,7 @@ public void testAddToBrokenPlugin() throws Exception {
XtextProjectHelper.NATURE_ID);
IProject project = pluginProjectFactory.createProject(null, null);
IJavaProject javaProject = JavaCore.create(project);
JavaProjectSetupUtil.makeJava8Compliant(javaProject);
JavaProjectSetupUtil.makeDefaultCompliant(javaProject);
project.findMember("META-INF").delete(true, null);
IFile file = project.getFile("src/Foo.xtend");
file.create(new StringInputStream("import org.eclipse.xtend.lib.annotations.Accessors class Foo { @Accessors int bar }"),
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/compiler/Bug456868Test.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class Bug456868Test extends AbstractXtendUITestCase {
@Test def void testProjectWithWhitespaceInNameWorks() {
// use names with whitespaces
project = createJavaProject("my project")
makeJava8Compliant(project)
makeDefaultCompliant(project)
libAdder.addLibsToClasspath(project, new NullProgressMonitor());
natureAdder.toggleNature(project.project)
createFile("my project/src/MyClass.xtend", '''
Expand Down
5 changes: 2 additions & 3 deletions ...pse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/compiler/JavaVersionSettingTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import org.eclipse.ui.texteditor.MarkerUtilities
import org.eclipse.xtend.ide.internal.XtendActivator
import org.eclipse.xtend.ide.tests.WorkbenchTestHelper
import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil
import org.eclipse.xtext.util.JavaVersion
import org.junit.After
import org.junit.AfterClass
import org.junit.Assert
Expand Down Expand Up @@ -58,9 +57,9 @@ class JavaVersionSettingTest extends Assert {
workbenchTestHelper.tearDown
}

@Test def void testCompileWithJava8() {
@Test def void testOverrideAnnotationIsGenerated() {
workbenchTestHelper.tearDown
WorkbenchTestHelper.createPluginProject(WorkbenchTestHelper.TESTPROJECT_NAME, JavaVersion.JAVA8)
WorkbenchTestHelper.createPluginProject(WorkbenchTestHelper.TESTPROJECT_NAME)
waitForJdtIndex()
val xtendFile = workbenchTestHelper.createFile('mypackage/OverrideTest.xtend', '''
package mypackage
Expand Down
5 changes: 2 additions & 3 deletions ...end.ide.tests/src/org/eclipse/xtend/ide/tests/compiler/RebuildAffectedResourcesTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import org.junit.Test
import static org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil.*

import static extension org.eclipse.ui.texteditor.MarkerUtilities.*
import org.eclipse.xtext.util.JavaVersion
import org.eclipse.xtext.testing.Flaky

class RebuildAffectedResourcesTest extends AbstractXtendUITestCase {
Expand Down Expand Up @@ -244,7 +243,7 @@ class RebuildAffectedResourcesTest extends AbstractXtendUITestCase {

@Test
def void testChangeInResourceReadFromAnnotationProcessor() {
val macroProject = JavaCore.create(WorkbenchTestHelper.createPluginProject(WorkbenchTestHelper.TESTPROJECT_NAME + "-anno", JavaVersion.JAVA8).registerForCleanUp)
val macroProject = JavaCore.create(WorkbenchTestHelper.createPluginProject(WorkbenchTestHelper.TESTPROJECT_NAME + "-anno").registerForCleanUp)
macroProject.createFile('src/anno/Anno.xtend', '''
package anno
import com.google.common.base.Splitter
Expand Down Expand Up @@ -275,7 +274,7 @@ class RebuildAffectedResourcesTest extends AbstractXtendUITestCase {
''')
WorkbenchTestHelper.addExportedPackages(macroProject.project, "anno")

val clientProject = JavaCore.create(WorkbenchTestHelper.createPluginProject(WorkbenchTestHelper.TESTPROJECT_NAME + "-client", JavaVersion.JAVA8).registerForCleanUp)
val clientProject = JavaCore.create(WorkbenchTestHelper.createPluginProject(WorkbenchTestHelper.TESTPROJECT_NAME + "-client").registerForCleanUp)
JavaProjectSetupUtil.addProjectReference(clientProject, macroProject)
val constants = clientProject.createFile('src/constants.txt', '''
A
Expand Down
2 changes: 1 addition & 1 deletion ...ipse.xtend.ide.tests/src/org/eclipse/xtend/ide/tests/contentassist/ContentAssistTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ public static IProject createPluginProject(String name) throws CoreException {
"org.eclipse.xtext.xbase.lib",
"org.eclipse.xtend.lib"));
IProject result = projectFactory.createProject(new NullProgressMonitor(), null);
JavaProjectSetupUtil.makeJava8Compliant(JavaCore.create(result));
JavaProjectSetupUtil.makeDefaultCompliant(JavaCore.create(result));
return result;
}
}
5 changes: 2 additions & 3 deletions ...e.tests/src/org/eclipse/xtend/ide/tests/macros/ActiveAnnotationsProcessingInIDETest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import org.eclipse.xtext.testing.XtextRunner
import org.eclipse.xtext.ui.editor.hover.html.IEObjectHoverDocumentationProvider
import org.eclipse.xtext.ui.resource.XtextResourceSetProvider
import org.eclipse.xtext.util.CancelIndicator
import org.eclipse.xtext.util.JavaVersion
import org.eclipse.xtext.util.StringInputStream
import org.eclipse.xtext.validation.CheckMode
import org.eclipse.xtext.validation.IResourceValidator
Expand Down Expand Up @@ -127,9 +126,9 @@ class ActiveAnnotationsProcessingInIDETest extends AbstractReusableActiveAnnotat

@BeforeClass
static def void createProjects() {
macroProject = JavaCore.create(createPluginProject("macroProject", JavaVersion.JAVA8))
macroProject = JavaCore.create(createPluginProject("macroProject"))
userProject = JavaCore::create(
createPluginProject("userProject", JavaVersion.JAVA8, "com.google.inject", "org.eclipse.xtend.lib",
createPluginProject("userProject", "com.google.inject", "org.eclipse.xtend.lib",
"org.eclipse.xtext.xbase.lib", "org.eclipse.xtend.ide.tests.data", "org.junit", "macroProject"))
macroProject.project.addExportedPackages("myannotation")
}
Expand Down
3 changes: 1 addition & 2 deletions ...pse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/builder/SameClassNamesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.eclipse.xtext.ui.testing.util.JavaProjectSetupUtil;
import org.eclipse.xtext.ui.util.JREContainerProvider;
import org.eclipse.xtext.ui.util.PluginProjectFactory;
import org.eclipse.xtext.util.JavaVersion;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.Conversions;
import org.eclipse.xtext.xbase.lib.Exceptions;
Expand Down Expand Up @@ -169,7 +168,7 @@ public IProject createPluginProject(final String name, final String... requiredB
NullProgressMonitor _nullProgressMonitor = new NullProgressMonitor();
final IProject result = projectFactory.createProject(_nullProgressMonitor, null);
final IJavaProject javaProject = JavaCore.create(result);
WorkbenchTestHelper.makeCompliantFor(javaProject, JavaVersion.JAVA8);
JavaProjectSetupUtil.makeDefaultCompliant(javaProject);
JavaProjectSetupUtil.addJreClasspathEntry(javaProject);
return result;
}
Expand Down
2 changes: 1 addition & 1 deletion ...eclipse.xtend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/compiler/Bug456868Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void tearDown() throws Exception {
public void testProjectWithWhitespaceInNameWorks() {
try {
this.project = JavaProjectSetupUtil.createJavaProject("my project");
JavaProjectSetupUtil.makeJava8Compliant(this.project);
JavaProjectSetupUtil.makeDefaultCompliant(this.project);
NullProgressMonitor _nullProgressMonitor = new NullProgressMonitor();
this.libAdder.addLibsToClasspath(this.project, _nullProgressMonitor);
this.natureAdder.toggleNature(this.project.getProject());
Expand Down
5 changes: 2 additions & 3 deletions ...tend.ide.tests/xtend-gen/org/eclipse/xtend/ide/tests/compiler/JavaVersionSettingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.eclipse.xtend.ide.tests.WorkbenchTestHelper;
import org.eclipse.xtend2.lib.StringConcatenation;
import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil;
import org.eclipse.xtext.util.JavaVersion;
import org.eclipse.xtext.xbase.lib.Exceptions;
import org.junit.After;
import org.junit.AfterClass;
Expand Down Expand Up @@ -64,10 +63,10 @@ public void tearDown() {
}

@Test
public void testCompileWithJava8() {
public void testOverrideAnnotationIsGenerated() {
try {
this.workbenchTestHelper.tearDown();
WorkbenchTestHelper.createPluginProject(WorkbenchTestHelper.TESTPROJECT_NAME, JavaVersion.JAVA8);
WorkbenchTestHelper.createPluginProject(WorkbenchTestHelper.TESTPROJECT_NAME);
IResourcesSetupUtil.waitForJdtIndex();
StringConcatenation _builder = new StringConcatenation();
_builder.append("package mypackage");
Expand Down
5 changes: 2 additions & 3 deletions ...de.tests/xtend-gen/org/eclipse/xtend/ide/tests/compiler/RebuildAffectedResourcesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.eclipse.xtext.testing.Flaky;
import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil;
import org.eclipse.xtext.ui.testing.util.JavaProjectSetupUtil;
import org.eclipse.xtext.util.JavaVersion;
import org.eclipse.xtext.util.StringInputStream;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.Conversions;
Expand Down Expand Up @@ -394,7 +393,7 @@ public void testChangeInAnnotationProcessor() {
@Test
public void testChangeInResourceReadFromAnnotationProcessor() {
try {
final IJavaProject macroProject = JavaCore.create(this.<IProject>registerForCleanUp(WorkbenchTestHelper.createPluginProject((WorkbenchTestHelper.TESTPROJECT_NAME + "-anno"), JavaVersion.JAVA8)));
final IJavaProject macroProject = JavaCore.create(this.<IProject>registerForCleanUp(WorkbenchTestHelper.createPluginProject((WorkbenchTestHelper.TESTPROJECT_NAME + "-anno"))));
StringConcatenation _builder = new StringConcatenation();
_builder.append("package anno");
_builder.newLine();
Expand Down Expand Up @@ -460,7 +459,7 @@ public void testChangeInResourceReadFromAnnotationProcessor() {
_builder.newLine();
this.createFile(macroProject, "src/anno/Anno.xtend", _builder.toString());
WorkbenchTestHelper.addExportedPackages(macroProject.getProject(), "anno");
final IJavaProject clientProject = JavaCore.create(this.<IProject>registerForCleanUp(WorkbenchTestHelper.createPluginProject((WorkbenchTestHelper.TESTPROJECT_NAME + "-client"), JavaVersion.JAVA8)));
final IJavaProject clientProject = JavaCore.create(this.<IProject>registerForCleanUp(WorkbenchTestHelper.createPluginProject((WorkbenchTestHelper.TESTPROJECT_NAME + "-client"))));
JavaProjectSetupUtil.addProjectReference(clientProject, macroProject);
StringConcatenation _builder_1 = new StringConcatenation();
_builder_1.append("A");
Expand Down
5 changes: 2 additions & 3 deletions ...ts/xtend-gen/org/eclipse/xtend/ide/tests/macros/ActiveAnnotationsProcessingInIDETest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.eclipse.xtext.ui.resource.XtextResourceSetProvider;
import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil;
import org.eclipse.xtext.util.CancelIndicator;
import org.eclipse.xtext.util.JavaVersion;
import org.eclipse.xtext.util.StringInputStream;
import org.eclipse.xtext.validation.CheckMode;
import org.eclipse.xtext.validation.IResourceValidator;
Expand Down Expand Up @@ -196,9 +195,9 @@ public void assertDocumentation(final CharSequence charSequence, final EObject s
@BeforeClass
public static void createProjects() {
try {
ActiveAnnotationsProcessingInIDETest.macroProject = JavaCore.create(WorkbenchTestHelper.createPluginProject("macroProject", JavaVersion.JAVA8));
ActiveAnnotationsProcessingInIDETest.macroProject = JavaCore.create(WorkbenchTestHelper.createPluginProject("macroProject"));
ActiveAnnotationsProcessingInIDETest.userProject = JavaCore.create(
WorkbenchTestHelper.createPluginProject("userProject", JavaVersion.JAVA8, "com.google.inject", "org.eclipse.xtend.lib",
WorkbenchTestHelper.createPluginProject("userProject", "com.google.inject", "org.eclipse.xtend.lib",
"org.eclipse.xtext.xbase.lib", "org.eclipse.xtend.ide.tests.data", "org.junit", "macroProject"));
WorkbenchTestHelper.addExportedPackages(ActiveAnnotationsProcessingInIDETest.macroProject.getProject(), "myannotation");
} catch (Throwable _e) {
Expand Down
3 changes: 2 additions & 1 deletion ...e.xtend.maven.plugin/src/main/java/org/eclipse/xtend/maven/AbstractXtendCompilerMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugins.annotations.Parameter;
import org.eclipse.xtend.core.compiler.batch.XtendBatchCompiler;
import org.eclipse.xtext.util.JavaVersion;
import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;

import com.google.common.base.Predicate;
Expand All @@ -47,7 +48,7 @@ public boolean apply(String filePath) {
*
* Supported values: 11, 17, 21 and so forth
*/
@Parameter(property="maven.compiler.source", defaultValue="21")
@Parameter(property="maven.compiler.source", defaultValue=JavaVersion.DEFAULT_QUALIFIER)
private String javaSourceVersion;

/**
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.performance.tests/CopyPerformanceTestData.mwe2.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk-11.0.8+10/"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.xtend.performance.tests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/xtend/performance/tests/CopyPerformanceTestData.mwe2 -p targetProject=&quot;${workspace_loc:org.eclipse.xtend.performance.tests}&quot; -p xbase.core=&quot;${workspace_loc:/org.eclipse.xtext.xbase}&quot;"/>
Expand Down
24 changes: 5 additions & 19 deletions ...erformance.tests/src/org/eclipse/xtend/performance/tests/PerformanceTestProjectSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

import org.eclipse.core.resources.ICommand;
import org.eclipse.core.resources.IContainer;
Expand All @@ -37,6 +36,7 @@
import org.eclipse.xtext.builder.nature.ToggleXtextNatureCommand;
import org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil;
import org.eclipse.xtext.ui.testing.util.JavaProjectSetupUtil;
import org.eclipse.xtext.ui.util.JREContainerProvider;
import org.eclipse.xtext.util.Strings;

import com.google.common.collect.Lists;
Expand Down Expand Up @@ -133,13 +133,13 @@ public static IJavaProject createJavaProject(
project.open(null);
project.setDescription(projectDescription, null);

classpathEntries.add(JavaCore.newContainerEntry(new Path("org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21")));
classpathEntries.add(JREContainerProvider.getDefaultJREContainerEntry());
classpathEntries.add(JavaCore.newContainerEntry(new Path("org.eclipse.pde.core.requiredPlugins")));

javaProject.setRawClasspath(classpathEntries.toArray(new IClasspathEntry[classpathEntries.size()]),
null);
makeJava21Compliant(javaProject);

JavaProjectSetupUtil.makeDefaultCompliant(javaProject);

javaProject.setOutputLocation(new Path("/" + projectName + "/bin"), null);
createManifest(projectName, project);
Expand All @@ -153,20 +153,6 @@ public static IJavaProject createJavaProject(
return javaProject ;
}

public static void makeJava21Compliant(IJavaProject javaProject) {
Map<String, String> options= javaProject.getOptions(false);
options.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_21);
options.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_21);
options.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_21);
options.put(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, JavaCore.ERROR);
options.put(JavaCore.COMPILER_PB_ENUM_IDENTIFIER, JavaCore.ERROR);
options.put(JavaCore.COMPILER_LOCAL_VARIABLE_ATTR, JavaCore.GENERATE);
options.put(JavaCore.COMPILER_LINE_NUMBER_ATTR, JavaCore.GENERATE);
options.put(JavaCore.COMPILER_SOURCE_FILE_ATTR, JavaCore.GENERATE);
options.put(JavaCore.COMPILER_CODEGEN_UNUSED_LOCAL, JavaCore.PRESERVE);
javaProject.setOptions(options);
}

protected static void refreshExternalArchives(IJavaProject p) throws JavaModelException {
IResourcesSetupUtil.waitForBuild(); // ensure that the auto-build job doesn't interfere with external jar refreshing
getJavaModel().refreshExternalArchives(new IJavaElement[] {p}, null);
Expand Down Expand Up @@ -213,7 +199,7 @@ private static void createManifest(final String projectName, final IProject proj
mainContent.append("Bundle-Version: 1.0.0\n");
mainContent.append("Bundle-SymbolicName: " + projectName.toLowerCase() + "; singleton:=true\n");
mainContent.append("Bundle-ActivationPolicy: lazy\n");
mainContent.append("Bundle-RequiredExecutionEnvironment: JavaSE-1.8\n");
mainContent.append("Bundle-RequiredExecutionEnvironment: " + JREContainerProvider.PREFERRED_BREE + "\n");
mainContent.append("Require-Bundle: com.google.guava,\n");
mainContent.append(" org.apache.log4j,\n");
mainContent.append(" org.eclipse.xtend.lib,\n");
Expand Down
5 changes: 3 additions & 2 deletions ...r.standalone/src/org/eclipse/xtext/builder/standalone/compiler/CompilerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@
import java.io.File;

import org.eclipse.xtext.resource.IResourceDescription;
import org.eclipse.xtext.util.JavaVersion;

/**
* @author Dennis Huebner - Initial contribution and API
*/
public class CompilerConfiguration {
private String sourceLevel = "8";
private String sourceLevel = JavaVersion.DEFAULT.getQualifier();

private String targetLevel = "8";
private String targetLevel = JavaVersion.DEFAULT.getQualifier();

private boolean verbose;

Expand Down
Loading
Loading