azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check if gradle module has kotlin runtime classes in module classpath

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2013-10-10 13:54:06 +04:00
parent a47d187c7a
commit 31fa1383ba
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithGradleConfigurator.java
+5
View File
@@ -33,6 +33,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.plugin.framework.KotlinFrameworkDetector;
import org.jetbrains.jet.plugin.framework.ui.ConfigureDialogWithModulesAndVersion; import org.jetbrains.jet.plugin.framework.ui.ConfigureDialogWithModulesAndVersion;
import org.jetbrains.plugins.gradle.util.GradleConstants; import org.jetbrains.plugins.gradle.util.GradleConstants;
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
@@ -63,6 +64,10 @@ public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfi
@Override @Override
public boolean isConfigured(@NotNull Module module) { public boolean isConfigured(@NotNull Module module) {
if (KotlinFrameworkDetector.isJavaKotlinModule(module)) {
return true;
}
GroovyFile moduleGradleFile = getBuildGradleFile(module.getProject(), getDefaultPathToBuildGradleFile(module)); GroovyFile moduleGradleFile = getBuildGradleFile(module.getProject(), getDefaultPathToBuildGradleFile(module));
if (moduleGradleFile != null && isFileConfigured(moduleGradleFile)) { if (moduleGradleFile != null && isFileConfigured(moduleGradleFile)) {
return true; return true;