From fd8bcf0342657b9cb602af64a12177426897b241 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Wed, 13 May 2015 17:41:16 +0300 Subject: [PATCH] gradle: fix gradle import when deprecated "out-of-process" mode used; IDEA-140243 Could not import any gradle project --- .../service/project/BaseGradleProjectResolverExtension.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 c51e05040b5b..6877b707a03d 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 @@ -63,6 +63,7 @@ import org.jetbrains.plugins.gradle.tooling.internal.init.Init; import org.jetbrains.plugins.gradle.util.GradleBundle; import org.jetbrains.plugins.gradle.util.GradleConstants; import org.jetbrains.plugins.gradle.util.GradleUtil; +import org.slf4j.impl.Log4jLoggerFactory; import java.io.File; import java.io.FilenameFilter; @@ -369,7 +370,7 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver @Override public Set getExtraProjectModelClasses() { Set result = ContainerUtil.set(GradleBuild.class, ExternalProject.class, ModuleExtendedModel.class); - if (!resolverCtx.isPreviewMode()) { + if (!ExternalSystemApiUtil.isInProcessMode(GradleConstants.SYSTEM_ID) || !resolverCtx.isPreviewMode()) { result.add(BuildScriptClasspathModel.class); } return result; @@ -494,6 +495,8 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver ContainerUtilRt.addIfNotNull(additionalEntries, PathUtil.getJarPathForClass(EmptyModuleType.class)); ContainerUtilRt.addIfNotNull(additionalEntries, PathUtil.getJarPathForClass(ProjectImportAction.class)); ContainerUtilRt.addIfNotNull(additionalEntries, PathUtil.getJarPathForClass(Init.class)); + ContainerUtilRt.addIfNotNull(additionalEntries, PathUtil.getJarPathForClass(org.slf4j.Logger.class)); + ContainerUtilRt.addIfNotNull(additionalEntries, PathUtil.getJarPathForClass(Log4jLoggerFactory.class)); for (String entry : additionalEntries) { classPath.add(entry); }