index 499be65..fe2f13f 100644 --- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseJdt.groovy +++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseJdt.groovy @@ -15,6 +15,7 @@ */ package org.gradle.plugins.ide.eclipse +import org.gradle.api.JavaVersion import org.gradle.internal.reflect.Instantiator import org.gradle.plugins.ide.api.PropertiesFileContentMerger import org.gradle.plugins.ide.api.PropertiesGeneratorTask @@ -44,8 +45,8 @@ class GenerateEclipseJdt extends PropertiesGeneratorTask { protected void configure(Jdt jdtContent) { def jdtModel = getJdt() jdtModel.file.beforeMerged.execute(jdtContent) - jdtContent.sourceCompatibility = jdtModel.sourceCompatibility - jdtContent.targetCompatibility = jdtModel.targetCompatibility + jdtContent.sourceCompatibility = JavaVersion.toVersion(jdtModel.sourceCompatibility) + jdtContent.targetCompatibility = JavaVersion.toVersion(jdtModel.targetCompatibility) jdtModel.file.whenMerged.execute(jdtContent) } } diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseJdt.groovy b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseJdt.groovy index b6f81f1..45b6e0e 100644 --- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseJdt.groovy +++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseJdt.groovy @@ -63,7 +63,8 @@ class EclipseJdt { *

* For example see docs for {@link EclipseJdt} */ - JavaVersion sourceCompatibility +// JavaVersion sourceCompatibility + def sourceCompatibility void setSourceCompatibility(Object sourceCompatibility) { this.sourceCompatibility = JavaVersion.toVersion(sourceCompatibility) @@ -74,7 +75,8 @@ class EclipseJdt { *

* For example see docs for {@link EclipseJdt} */ - JavaVersion targetCompatibility +// JavaVersion targetCompatibility + def targetCompatibility void setTargetCompatibility(Object targetCompatibility) { this.targetCompatibility = JavaVersion.toVersion(targetCompatibility)