From b205e10b314cbc6a921d22403afcc44858d8b235 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Tue, 30 Jul 2013 11:34:47 +0400 Subject: [PATCH] Don't show "set up as Java module" notification for android project configured with gradle --- .../KotlinLibrariesNotificationProvider.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/jet/plugin/versions/KotlinLibrariesNotificationProvider.java b/idea/src/org/jetbrains/jet/plugin/versions/KotlinLibrariesNotificationProvider.java index dd8c4c63b88..281fb8f56fc 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/KotlinLibrariesNotificationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/versions/KotlinLibrariesNotificationProvider.java @@ -17,6 +17,8 @@ package org.jetbrains.jet.plugin.versions; import com.intellij.ProjectTopics; +import com.intellij.facet.Facet; +import com.intellij.facet.FacetManager; import com.intellij.framework.addSupport.impl.AddSupportForSingleFrameworkDialog; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.compiler.CompilerManager; @@ -105,7 +107,7 @@ public class KotlinLibrariesNotificationProvider extends EditorNotifications.Pro } public static boolean isModuleAlreadyConfigured(Module module) { - return isMavenModule(module) || KotlinFrameworkDetector.isJsKotlinModule(module) || KotlinFrameworkDetector.isJavaKotlinModule(module); + return isMavenModule(module) || isAndroidGradleModule(module) || KotlinFrameworkDetector.isJsKotlinModule(module) || KotlinFrameworkDetector.isJavaKotlinModule(module); } private static boolean isMavenModule(@NotNull Module module) { @@ -114,6 +116,17 @@ public class KotlinLibrariesNotificationProvider extends EditorNotifications.Pro return "true".equals(module.getOptionValue("org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule")); } + private static boolean isAndroidGradleModule(@NotNull Module module) { + // We don't want to depend on the Android-Gradle plugin + // See com.android.tools.idea.gradle.util.Projects.isGradleProject() + for (Facet facet : FacetManager.getInstance(module).getAllFacets()) { + if (facet.getName().equals("Android-Gradle")) { + return true; + } + } + return false; + } + private static EditorNotificationPanel createFrameworkConfigurationNotificationPanel(final Module module) { EditorNotificationPanel answer = new EditorNotificationPanel();