Merge pull request #201 from xtext/cd_xtendIssue1301

[eclipse/xtext-xtend#1301] fix targetJavaVersion preference
xtext · Mar 16, 2022 · a038c95 · a038c95
2 parents 27568b7 + 6cf4dc1
commit a038c95
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...radle-plugin/src/integTest/java/org/xtext/gradle/test/WhenTheEclipsePluginIsApplied.xtend b/...radle-plugin/src/integTest/java/org/xtext/gradle/test/WhenTheEclipsePluginIsApplied.xtend
@@ -55,7 +55,7 @@ class WhenTheEclipsePluginIsApplied extends AbstractIntegrationTest {
 		prefs.shouldContain('generateGeneratedAnnotation', false)
 		prefs.shouldContain('includeDateInGenerated', false)
 		prefs.shouldContain('useJavaCompilerCompliance', false)
-		prefs.shouldContain('targetJavaVersion', 'Java6')
+		prefs.shouldContain('targetJavaVersion', 'JAVA6')
 		prefs.shouldContain('outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder', true)
 		prefs.shouldContain('outlet.DEFAULT_OUTPUT.installDslAsPrimarySource', false)
 		prefs.shouldContain('outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables', true)

diff --git a/xtext-gradle-plugin/src/main/java/org/xtext/gradle/tasks/XtextEclipseSettings.xtend b/xtext-gradle-plugin/src/main/java/org/xtext/gradle/tasks/XtextEclipseSettings.xtend
@@ -54,7 +54,7 @@ class XtextEclipseSettings extends DefaultTask {
 			if (generatedAnnotation.comment !== null) {
 				prefs.put("generatedAnnotationComment", generatedAnnotation.comment)
 			}
-			prefs.put("targetJavaVersion", "Java" + JavaVersion.toVersion(javaSourceLevel).majorVersion)
+			prefs.put("targetJavaVersion", "JAVA" + JavaVersion.toVersion(javaSourceLevel).majorVersion)
 			prefs.putBoolean("useJavaCompilerCompliance", false)
 			outlets.forEach [ outlet |
 				addOutletPreferences(prefs, language, outlet)