Skip to content

Commit a038c95

Browse files
authored
Merge pull request #201 from xtext/cd_xtendIssue1301
[eclipse-archived/xtext-xtend#1301] fix targetJavaVersion preference
2 parents 27568b7 + 6cf4dc1 commit a038c95

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

xtext-gradle-plugin/src/integTest/java/org/xtext/gradle/test/WhenTheEclipsePluginIsApplied.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class WhenTheEclipsePluginIsApplied extends AbstractIntegrationTest {
5555
prefs.shouldContain('generateGeneratedAnnotation', false)
5656
prefs.shouldContain('includeDateInGenerated', false)
5757
prefs.shouldContain('useJavaCompilerCompliance', false)
58-
prefs.shouldContain('targetJavaVersion', 'Java6')
58+
prefs.shouldContain('targetJavaVersion', 'JAVA6')
5959
prefs.shouldContain('outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder', true)
6060
prefs.shouldContain('outlet.DEFAULT_OUTPUT.installDslAsPrimarySource', false)
6161
prefs.shouldContain('outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables', true)

xtext-gradle-plugin/src/main/java/org/xtext/gradle/tasks/XtextEclipseSettings.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class XtextEclipseSettings extends DefaultTask {
5454
if (generatedAnnotation.comment !== null) {
5555
prefs.put("generatedAnnotationComment", generatedAnnotation.comment)
5656
}
57-
prefs.put("targetJavaVersion", "Java" + JavaVersion.toVersion(javaSourceLevel).majorVersion)
57+
prefs.put("targetJavaVersion", "JAVA" + JavaVersion.toVersion(javaSourceLevel).majorVersion)
5858
prefs.putBoolean("useJavaCompilerCompliance", false)
5959
outlets.forEach [ outlet |
6060
addOutletPreferences(prefs, language, outlet)

0 commit comments

Comments
 (0)