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

Remove Gradle(Java) Kotlin configurator in Android modules (#KT-17946)

Browse Source
This commit is contained in:
Yan Zhulanow
2018-06-18 19:40:12 +03:00
parent 06af2a88f0
commit b2938ceacf
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.kt
+6
View File
@@ -16,9 +16,11 @@
package org.jetbrains.kotlin.idea.configuration package org.jetbrains.kotlin.idea.configuration
import com.intellij.facet.FacetManager
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.projectRoots.Sdk
import com.intellij.psi.PsiFile import com.intellij.psi.PsiFile
import org.jetbrains.kotlin.idea.core.isAndroidModule
import org.jetbrains.kotlin.idea.versions.getDefaultJvmTarget import org.jetbrains.kotlin.idea.versions.getDefaultJvmTarget
import org.jetbrains.kotlin.resolve.TargetPlatform import org.jetbrains.kotlin.resolve.TargetPlatform
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform 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 getJvmTarget(sdk: Sdk?, version: String) = getDefaultJvmTarget(sdk, version)?.description
override fun isApplicable(module: Module): Boolean {
return super.isApplicable(module) && !module.isAndroidModule()
}
override fun configureModule( override fun configureModule(
module: Module, module: Module,
file: PsiFile, file: PsiFile,