From 31fa1383ba1a7113201d3bb21d454344ae8d136b Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Thu, 10 Oct 2013 13:54:06 +0400 Subject: [PATCH] Check if gradle module has kotlin runtime classes in module classpath --- .../plugin/configuration/KotlinWithGradleConfigurator.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithGradleConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithGradleConfigurator.java index 5e02ea9d1b1..546e2e2f621 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithGradleConfigurator.java +++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithGradleConfigurator.java @@ -33,6 +33,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.plugin.framework.KotlinFrameworkDetector; import org.jetbrains.jet.plugin.framework.ui.ConfigureDialogWithModulesAndVersion; import org.jetbrains.plugins.gradle.util.GradleConstants; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; @@ -63,6 +64,10 @@ public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfi @Override public boolean isConfigured(@NotNull Module module) { + if (KotlinFrameworkDetector.isJavaKotlinModule(module)) { + return true; + } + GroovyFile moduleGradleFile = getBuildGradleFile(module.getProject(), getDefaultPathToBuildGradleFile(module)); if (moduleGradleFile != null && isFileConfigured(moduleGradleFile)) { return true;