Skip to content

Commit fb5e1db

Browse files
committed
[eclipse-archived/xtext-core#1835] better treatment of unsupported Java versions in Xtext
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
1 parent 1738f18 commit fb5e1db

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

xtext-gradle-builder/src/main/java/org/xtext/gradle/builder/XtextGradleBuilder.xtend

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,16 @@ class XtextGradleBuilder implements IncrementalXtextBuilder {
230230
attachToEmfObject(resourceSet)
231231
language2GeneratorConfig.putAll(
232232
gradleRequest.generatorConfigsByLanguage.mapValues [ gradleConfig |
233+
val javaVersion = JavaVersion.fromQualifier(gradleConfig.javaSourceLevel.toString)
234+
if (javaVersion === null) {
235+
gradleRequest.logger.warn("Xtext does not support Java " + gradleConfig.javaSourceLevel.toString + ", falling back to " + JavaVersion.JAVA8.label)
236+
}
233237
new GeneratorConfig => [
234238
generateSyntheticSuppressWarnings = gradleConfig.isGenerateSyntheticSuppressWarnings
235239
generateGeneratedAnnotation = gradleConfig.isGenerateGeneratedAnnotation
236-
includeDateInGeneratedAnnotation = gradleConfig.isIncludeDateInGeneratedAnnotation
240+
includeDateInGeneratedAnnotation = gradleConfig.isIncludeDateInGeneratedAnnotation
237241
generatedAnnotationComment = gradleConfig.generatedAnnotationComment
238-
javaSourceVersion = JavaVersion.fromQualifier(gradleConfig.javaSourceLevel.toString)
242+
javaSourceVersion = javaVersion ?: JavaVersion.JAVA8
239243
]
240244
]
241245
)

0 commit comments

Comments
 (0)