[eclipse/xtext-core#1835] better treatment of unsupported Java versio…

…ns in Xtext Signed-off-by: Christian Dietrich <[email protected]>
xtext · Mar 31, 2023 · 7f9e7be · 7f9e7be
1 parent c37d2db
commit 7f9e7be
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/xtext-gradle-builder/src/main/java/org/xtext/gradle/builder/XtextGradleBuilder.xtend b/xtext-gradle-builder/src/main/java/org/xtext/gradle/builder/XtextGradleBuilder.xtend
@@ -224,12 +224,16 @@ class XtextGradleBuilder implements IncrementalXtextBuilder {
 			attachToEmfObject(resourceSet)
 			language2GeneratorConfig.putAll(
 				gradleRequest.generatorConfigsByLanguage.mapValues [ gradleConfig |
+					val javaVersion = JavaVersion.fromQualifier(gradleConfig.javaSourceLevel.toString)
+					if (javaVersion === null) {
+						gradleRequest.logger.warn("Xtext does not support Java " + gradleConfig.javaSourceLevel.toString + ", falling back to " + JavaVersion.JAVA8.label)
+					}
 					new GeneratorConfig => [
 						generateSyntheticSuppressWarnings = gradleConfig.isGenerateSyntheticSuppressWarnings
 						generateGeneratedAnnotation = gradleConfig.isGenerateGeneratedAnnotation
-						includeDateInGeneratedAnnotation = gradleConfig.isIncludeDateInGeneratedAnnotation
+						includeDateInGeneratedAnnotation = 	gradleConfig.isIncludeDateInGeneratedAnnotation
 						generatedAnnotationComment = gradleConfig.generatedAnnotationComment
-						javaSourceVersion = JavaVersion.fromQualifier(gradleConfig.javaSourceLevel.toString)
+						javaSourceVersion = javaVersion ?: JavaVersion.JAVA8
 					]
 				]
 			)