Android Studio adds Android-Gradle facet to all modules, so we need to check for Android facet and Gradle module instead

#KT-9600 Fixed
2016-01-19 19:33:11 +01:00
parent 4ab6436f93
commit f88f38f7d2
1 changed files with 4 additions and 3 deletions
@@ -27,11 +27,12 @@ public class KotlinModuleTypeManagerImpl extends KotlinModuleTypeManager {
    public 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()
+        boolean hasAndroidFacet = false;
        for (Facet facet : FacetManager.getInstance(module).getAllFacets()) {
-            if (facet.getName().equals("Android-Gradle")) {
-                return true;
+            if (facet.getName().equals("Android")) {
+                hasAndroidFacet = true;
            }
        }
-        return false;
+        return hasAndroidFacet && isGradleModule(module);
    }
 }