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

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

Browse Source 
#KT-9600 Fixed
This commit is contained in:
Dmitry Jemerov
2016-01-19 19:33:11 +01:00
parent 4ab6436f93
commit f88f38f7d2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/KotlinModuleTypeManagerImpl.java
+4 -3
View File
@@ -27,11 +27,12 @@ public class KotlinModuleTypeManagerImpl extends KotlinModuleTypeManager {
public boolean isAndroidGradleModule(@NotNull Module module) { public boolean isAndroidGradleModule(@NotNull Module module) {
// We don't want to depend on the Android-Gradle plugin // We don't want to depend on the Android-Gradle plugin
// See com.android.tools.idea.gradle.util.Projects.isGradleProject() // See com.android.tools.idea.gradle.util.Projects.isGradleProject()
boolean hasAndroidFacet = false;
for (Facet facet : FacetManager.getInstance(module).getAllFacets()) { for (Facet facet : FacetManager.getInstance(module).getAllFacets()) {
if (facet.getName().equals("Android-Gradle")) { if (facet.getName().equals("Android")) {
return true; hasAndroidFacet = true;
} }
} }
return false; return hasAndroidFacet && isGradleModule(module);
} }
} }