MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

gradle: do not fail if Gradle <= 1.7 used if org.gradle.tooling.model.idea.IdeaSourceDirectory.isGenerated method used

Browse Source
This commit is contained in:
Vladislav.Soroka
2015-01-16 16:49:19 +03:00
parent f15358d94c
commit 28b10b5f9c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
+10 -4
View File
@@ -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());
}