Skip to content

Take release level into account when check for java9 #4529

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

Merged
stephan-herrmann merged 1 commit into from
Nov 11, 2025
Merged

Take release level into account when check for java9 #4529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions ...dt.core.tests.model/src/org/eclipse/jdt/core/tests/model/ReconcilerMultiReleaseTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ public IProblemRequestor getProblemRequestor(ICompilationUnit unit) {
@Override
public void setUpSuite() throws Exception {
super.setUpSuite();

IJavaProject mrproject = createJavaProject("ReconcilerMR", new String[] { "src", "src9", "src21" },
new String[] { "JCL18_LIB" }, "bin");
new String[] { "JCL_21_LIB" }, "bin", "21", true);
createFolder("/ReconcilerMR/src/p");
createFolder("/ReconcilerMR/src9/p");
createFolder("/ReconcilerMR/src21/p");
Expand Down Expand Up @@ -112,6 +111,9 @@ void m(B b) {
mrproject.setOption(JavaCore.COMPILER_RELEASE, JavaCore.ENABLED);
mrproject.setOption(JavaCore.COMPILER_PB_UNUSED_LOCAL, JavaCore.IGNORE);
mrproject.setOption(JavaCore.COMPILER_PB_INVALID_JAVADOC, JavaCore.WARNING);
mrproject.setOption(JavaCore.COMPILER_COMPLIANCE, "1.8");
mrproject.setOption(JavaCore.COMPILER_SOURCE, "1.8");
mrproject.setOption(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, "1.8");
}

@Override
Expand All @@ -136,6 +138,8 @@ public class D {
void m(B b) {
// Calling method m only available from Java 21+
b.m();
// Calling a JDK class should work
System.out.println("Running");
}
}
""";
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SearchableEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public SearchableEnvironment(JavaProject project, org.eclipse.jdt.core.ICompilat
|| !JavaCore.IGNORE.equals(project.getOption(JavaCore.COMPILER_PB_DISCOURAGED_REFERENCE, true));
this.workingCopies = workingCopies;
this.nameLookup = project.newNameLookup(workingCopies, excludeTestCode);
boolean java9plus = JavaCore.callReadOnly(() -> CompilerOptions
boolean java9plus = release >=JavaProject.FIRST_MULTI_RELEASE || JavaCore.callReadOnly(() -> CompilerOptions
Comment thread
stephan-herrmann marked this conversation as resolved.
.versionToJdkLevel(project.getOption(JavaCore.COMPILER_COMPLIANCE, true)) >= ClassFileConstants.JDK9);
if (java9plus) {
this.knownModuleLocations = new HashMap<>();
Expand Down
Loading