From b2938ceacf230f990084acee27c2ef3ac020dec7 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Mon, 18 Jun 2018 19:40:12 +0300
Subject: [PATCH] Remove Gradle(Java) Kotlin configurator in Android modules
 (#KT-17946)

---
 .../idea/configuration/KotlinGradleModuleConfigurator.kt    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.kt
index cb0c37cc261..d71ee88f97d 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.kt
@@ -16,9 +16,11 @@
 
 package org.jetbrains.kotlin.idea.configuration
 
+import com.intellij.facet.FacetManager
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.projectRoots.Sdk
 import com.intellij.psi.PsiFile
+import org.jetbrains.kotlin.idea.core.isAndroidModule
 import org.jetbrains.kotlin.idea.versions.getDefaultJvmTarget
 import org.jetbrains.kotlin.resolve.TargetPlatform
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
@@ -42,6 +44,10 @@ class KotlinGradleModuleConfigurator : KotlinWithGradleConfigurator() {
 
     override fun getJvmTarget(sdk: Sdk?, version: String) = getDefaultJvmTarget(sdk, version)?.description
 
+    override fun isApplicable(module: Module): Boolean {
+        return super.isApplicable(module) && !module.isAndroidModule()
+    }
+
     override fun configureModule(
         module: Module,
         file: PsiFile,