Skip to content
This repository was archived by the owner on Apr 21, 2023. It is now read-only.

[eclipse/xtext#1982] support for java 17 #821

Merged
merged 1 commit into from
Oct 10, 2022
Merged

[eclipse/xtext#1982] support for java 17 #821

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
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pipeline {
parameters {
// see https://wiki.eclipse.org/Jenkins#JDK
choice(name: 'JDK_VERSION', description: 'Which JDK should be used?', choices: [
'temurin-jdk8-latest', 'temurin-jdk11-latest', 'temurin-jdk17-latest'
'temurin-jdk11-latest', 'temurin-jdk17-latest'
])
booleanParam(
name: 'TRIGGER_DOWNSTREAM_BUILD',
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildscript {
}

plugins {
id 'org.ajoberstar.grgit' version '4.1.1'
id 'org.ajoberstar.grgit' version '5.0.0'
}

apply from: "${rootDir}/gradle/versions.gradle"
Expand Down
2 changes: 1 addition & 1 deletion gradle/java-compiler-settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Configuration of Java compiler, Javadoc, additional archives, and additional dependency configurations.
*/

sourceCompatibility = '1.8'
sourceCompatibility = '11'

tasks.withType(JavaCompile) {
options.encoding = 'ISO-8859-1'
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.builder.standalone.tests/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<attribute name="ignore_optional_problems" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/main"/>
</classpath>
6 changes: 3 additions & 3 deletions org.eclipse.xtext.builder.standalone.tests/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.source=11
2 changes: 1 addition & 1 deletion org.eclipse.xtext.builder.standalone.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Xtext Builder Standalone Tests
Bundle-SymbolicName: org.eclipse.xtext.builder.standalone.tests;singleton:=true
Bundle-Version: 2.29.0.qualifier
Bundle-Vendor: Eclipse Xtext
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.builder.standalone,
org.eclipse.xtext.testing,
Expand Down
1 change: 0 additions & 1 deletion org.eclipse.xtext.builder.standalone.tests/test-data/ec-test/test-class/TestClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
public class TestClass {

}
2 changes: 1 addition & 1 deletion org.eclipse.xtext.builder.standalone/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/main"/>
</classpath>
6 changes: 3 additions & 3 deletions org.eclipse.xtext.builder.standalone/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.source=11
2 changes: 1 addition & 1 deletion org.eclipse.xtext.builder.standalone/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.builder.standalone
Bundle-Version: 2.29.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Xtext
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Import-Package: org.apache.log4j;version="1.2.19"
Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.29.0",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.common.types.tests/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/main"/>
</classpath>
6 changes: 3 additions & 3 deletions org.eclipse.xtext.common.types.tests/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.source=11
2 changes: 1 addition & 1 deletion org.eclipse.xtext.common.types.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Xtext Common Types Plugin Tests
Bundle-SymbolicName: org.eclipse.xtext.common.types.tests;singleton:=true
Bundle-Version: 2.29.0.qualifier
Bundle-Vendor: Eclipse Xtext
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtext.testing,
org.eclipse.xtext.util,
org.eclipse.xtext.common.types,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.common.types.tests/META-INF/MANIFEST.MF_gen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.xtext.common.types.tests
Bundle-SymbolicName: org.eclipse.xtext.common.types.tests; singleton:=true
Bundle-Version: 0.0.1
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.xtext.common.types.xtext.ui
Require-Bundle: org.objectweb.asm;bundle-version="[9.3.0,9.4.0)";resolution:=optional,
Expand Down
8 changes: 4 additions & 4 deletions ...ypes.tests/tests/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,13 +830,13 @@ public void testMemberCount_16() {
assertEquals(Arrays.toString(TestEnum.class.getDeclaredMethods()), 2, methodCount);
int constructorCount = TestEnum.class.getDeclaredConstructors().length;
// TestEnum(String, int, String), TestEnum(String, int, String, EnumType)
assertEquals(Arrays.toString(TestEnum.class.getDeclaredConstructors()), 2, constructorCount);
assertEquals(Arrays.toString(TestEnum.class.getDeclaredConstructors()), 1, constructorCount);
int fieldCount = TestEnum.class.getDeclaredFields().length;
// FirstValue, SecondValue, string, ENUM$VALUES
assertEquals(Arrays.toString(TestEnum.class.getDeclaredFields()), 4, fieldCount);
// ENUM$VALUES is synthetic
// TestEnum(String, String, EnumType) is synthetic
assertEquals(type.getMembers().toString(), innerTypesCount + methodCount + constructorCount + fieldCount - 2,
assertEquals(type.getMembers().toString(), innerTypesCount + methodCount + constructorCount + fieldCount - 1,
type.getMembers().size());
} catch (AssertionError e) {
String typeName = TestEnum.class.getName();
Expand All @@ -849,14 +849,14 @@ public void testMemberCount_16() {
assertEquals(Arrays.toString(TestEnum.class.getDeclaredMethods()), 3, methodCount);
int constructorCount = TestEnum.class.getDeclaredConstructors().length;
// TestEnum(String, int, String), TestEnum(String, int, String, EnumType)
assertEquals(Arrays.toString(TestEnum.class.getDeclaredConstructors()), 2, constructorCount);
assertEquals(Arrays.toString(TestEnum.class.getDeclaredConstructors()), 1, constructorCount);
int fieldCount = TestEnum.class.getDeclaredFields().length;
// FirstValue, SecondValue, string, ENUM$VALUES
assertEquals(Arrays.toString(TestEnum.class.getDeclaredFields()), 4, fieldCount);
// ENUM$VALUES is synthetic
// TestEnum(String, String, EnumType) is synthetic
// TestEnum$values is synthetic
assertEquals(type.getMembers().toString(), innerTypesCount + methodCount + constructorCount + fieldCount - 3,
assertEquals(type.getMembers().toString(), innerTypesCount + methodCount + constructorCount + fieldCount - 2,
type.getMembers().size());
}
}
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.common.types/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/main"/>
</classpath>
6 changes: 3 additions & 3 deletions org.eclipse.xtext.common.types/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.source=11
2 changes: 1 addition & 1 deletion org.eclipse.xtext.common.types/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Require-Bundle:
io.github.classgraph;bundle-version="4.8.149"
Import-Package: org.apache.commons.logging;version="1.0.4";resolution:=optional,
org.apache.log4j;version="1.2.19"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.xtext.common.types,
org.eclipse.xtext.common.types.access;
x-friends:="org.eclipse.xtext.common.types.tests,
Expand Down
10 changes: 8 additions & 2 deletions ....xtext.common.types/src/org/eclipse/xtext/common/types/descriptions/ClasspathScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2015, 2022 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
Expand Down Expand Up @@ -154,7 +154,13 @@ public String[] getSystemClasspath() {
try (ScanResult scanResult = classGraph.scan()) {
List<URI> classpathURIs = scanResult.getClasspathURIs();
systemClasspath = classpathURIs.stream()
.map(URI::getPath)
.map((uri)-> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBH I don't know

if ("jrt".equals(uri.getScheme())) {
return null; // TODO what do we need to pass to ASTParser in JDT properly? anything at all?
} else {
return uri.getPath();
}
})
.filter(Objects::nonNull)
.toArray(String[]::new);
return systemClasspath;
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.ecore/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/main"/>
</classpath>
6 changes: 3 additions & 3 deletions org.eclipse.xtext.ecore/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.source=11
2 changes: 1 addition & 1 deletion org.eclipse.xtext.ecore/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Bundle-Version: 2.29.0.qualifier
Bundle-Vendor: Eclipse Xtext
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.13.0",
org.eclipse.xtext;visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.xtext.ecore;
uses:="org.eclipse.emf.ecore,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.extras.tests/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/main"/>
</classpath>
6 changes: 3 additions & 3 deletions org.eclipse.xtext.extras.tests/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.source=11
2 changes: 1 addition & 1 deletion org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Xtext Extras Runtime Tests
Bundle-SymbolicName: org.eclipse.xtext.extras.tests;singleton:=true
Bundle-Version: 2.29.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.xtext.enumrules,
org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF_gen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.xtext.extras.tests
Bundle-SymbolicName: org.eclipse.xtext.extras.tests;singleton:=true
Bundle-Version: 0.0.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.xtext.enumrules,
org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.generator/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/main"/>
</classpath>
6 changes: 3 additions & 3 deletions org.eclipse.xtext.generator/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.source=11
2 changes: 1 addition & 1 deletion org.eclipse.xtext.generator/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.generator; singleton:=true
Bundle-Version: 2.29.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Xtext
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.xtext.generator,
org.eclipse.xtext.generator.adapter,
org.eclipse.xtext.generator.builder,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.java.tests/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/main"/>
</classpath>
6 changes: 3 additions & 3 deletions org.eclipse.xtext.java.tests/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand Down Expand Up @@ -98,4 +98,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.source=11
2 changes: 1 addition & 1 deletion org.eclipse.xtext.java.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Xtext Java Tests
Bundle-SymbolicName: org.eclipse.xtext.java.tests;singleton:=true
Bundle-Version: 2.29.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.emf.common,
Expand Down
8 changes: 4 additions & 4 deletions ...t.java.tests/src/org/eclipse/xtext/common/types/access/impl/AbstractTypeProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,13 +831,13 @@ public void testMemberCount_16() {
assertEquals(Arrays.toString(TestEnum.class.getDeclaredMethods()), 2, methodCount);
int constructorCount = TestEnum.class.getDeclaredConstructors().length;
// TestEnum(String, int, String), TestEnum(String, int, String, EnumType)
assertEquals(Arrays.toString(TestEnum.class.getDeclaredConstructors()), 2, constructorCount);
assertEquals(Arrays.toString(TestEnum.class.getDeclaredConstructors()), 1, constructorCount);
int fieldCount = TestEnum.class.getDeclaredFields().length;
// FirstValue, SecondValue, string, ENUM$VALUES
assertEquals(Arrays.toString(TestEnum.class.getDeclaredFields()), 4, fieldCount);
// ENUM$VALUES is synthetic
// TestEnum(String, String, EnumType) is synthetic
assertEquals(type.getMembers().toString(), innerTypesCount + methodCount + constructorCount + fieldCount - 2,
assertEquals(type.getMembers().toString(), innerTypesCount + methodCount + constructorCount + fieldCount - 1,
type.getMembers().size());
} catch (AssertionError e) {
String typeName = TestEnum.class.getName();
Expand All @@ -850,14 +850,14 @@ public void testMemberCount_16() {
assertEquals(Arrays.toString(TestEnum.class.getDeclaredMethods()), 3, methodCount);
int constructorCount = TestEnum.class.getDeclaredConstructors().length;
// TestEnum(String, int, String), TestEnum(String, int, String, EnumType)
assertEquals(Arrays.toString(TestEnum.class.getDeclaredConstructors()), 2, constructorCount);
assertEquals(Arrays.toString(TestEnum.class.getDeclaredConstructors()), 1, constructorCount);
int fieldCount = TestEnum.class.getDeclaredFields().length;
// FirstValue, SecondValue, string, ENUM$VALUES
assertEquals(Arrays.toString(TestEnum.class.getDeclaredFields()), 4, fieldCount);
// ENUM$VALUES is synthetic
// TestEnum(String, String, EnumType) is synthetic
// TestEnum$values is synthetic
assertEquals(type.getMembers().toString(), innerTypesCount + methodCount + constructorCount + fieldCount - 3,
assertEquals(type.getMembers().toString(), innerTypesCount + methodCount + constructorCount + fieldCount - 2,
type.getMembers().size());
}
}
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.java/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/main"/>
</classpath>
6 changes: 3 additions & 3 deletions org.eclipse.xtext.java/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.java/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Xtext Java Language
Bundle-SymbolicName: org.eclipse.xtext.java
Bundle-Version: 2.29.0.qualifier
Bundle-Vendor: Eclipse Xtext
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.common.types,
org.eclipse.xtend.lib,
Expand Down
Loading