From 28b10b5f9c09a7ccf696b39aa0a6aa94ad17eddb Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Fri, 16 Jan 2015 16:41:25 +0300 Subject: [PATCH] gradle: do not fail if Gradle <= 1.7 used if org.gradle.tooling.model.idea.IdeaSourceDirectory.isGenerated method used --- .../BaseGradleProjectResolverExtension.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 036e61f5be13..a538babfa138 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 @@ -564,10 +564,16 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver } for (IdeaSourceDirectory dir : dirs) { ExternalSystemSourceType dirSourceType = type; - if (dir.isGenerated() && !dirSourceType.isGenerated()) { - final ExternalSystemSourceType generatedType = - ExternalSystemSourceType.from(dirSourceType.isTest(), dir.isGenerated(), dirSourceType.isResource(), dirSourceType.isExcluded()); - dirSourceType = generatedType != null ? generatedType : dirSourceType; + try { + if (dir.isGenerated() && !dirSourceType.isGenerated()) { + final ExternalSystemSourceType generatedType = + ExternalSystemSourceType.from(dirSourceType.isTest(), dir.isGenerated(), dirSourceType.isResource(), dirSourceType.isExcluded()); + dirSourceType = generatedType != null ? generatedType : dirSourceType; + } + } + catch (UnsupportedMethodException e) { + // org.gradle.tooling.model.idea.IdeaSourceDirectory.isGenerated method supported only since Gradle 2.2 + LOG.warn(e.getMessage()); } contentRoot.storePath(dirSourceType, dir.getDirectory().getAbsolutePath()); }