From 26141bd5c29ce76be67c7d10ca52459074c188ce Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Mon, 20 Jun 2016 11:58:31 +0300 Subject: [PATCH] IDEA-143170 Gradle import does not set the Java language level --- .../BaseGradleProjectResolverExtension.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java index 37d98cfe34aa..71b813752edc 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java @@ -225,6 +225,21 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver assert sourceSetMap != null; sourceSetMap.put(moduleId, Pair.create(sourceSetDataNode, sourceSet)); } + } else { + try { + IdeaJavaLanguageSettings languageSettings = gradleModule.getJavaLanguageSettings(); + if(languageSettings != null) { + if(languageSettings.getLanguageLevel() != null) { + mainModuleData.setSourceCompatibility(languageSettings.getLanguageLevel().toString()); + } + if(languageSettings.getTargetBytecodeVersion() != null) { + mainModuleData.setTargetCompatibility(languageSettings.getTargetBytecodeVersion().toString()); + } + } + } + catch (UnsupportedMethodException ignore) { + // org.gradle.tooling.model.idea.IdeaModule.getJavaLanguageSettings method supported since Gradle 2.11 + } } final ProjectData projectData = projectDataNode.getData();