From 8568bde4df279984eb244e163c038a926d005b54 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 25 Jul 2017 15:52:39 +0300 Subject: [PATCH] as31: Fix compilation (cherry picked from commit bc0bc0e) --- .../android/ConvertJavaToKotlinProviderImpl.kt.as31 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/ConvertJavaToKotlinProviderImpl.kt.as31 b/idea/idea-android/src/org/jetbrains/kotlin/android/ConvertJavaToKotlinProviderImpl.kt.as31 index 120bc03a6e0..d3549c18501 100644 --- a/idea/idea-android/src/org/jetbrains/kotlin/android/ConvertJavaToKotlinProviderImpl.kt.as31 +++ b/idea/idea-android/src/org/jetbrains/kotlin/android/ConvertJavaToKotlinProviderImpl.kt.as31 @@ -22,18 +22,14 @@ import com.intellij.psi.PsiFile import com.intellij.psi.PsiJavaFile import org.jetbrains.kotlin.android.configure.KotlinAndroidGradleModuleConfigurator import org.jetbrains.kotlin.idea.actions.JavaToKotlinAction -import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinStatus import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator -import org.jetbrains.kotlin.idea.configuration.excludeSourceRootModules -import org.jetbrains.kotlin.idea.util.projectStructure.allModules +import org.jetbrains.kotlin.idea.configuration.getCanBeConfiguredModules import org.jetbrains.kotlin.idea.versions.bundledRuntimeVersion class ConvertJavaToKotlinProviderImpl : ConvertJavaToKotlinProvider { override fun configureKotlin(project: Project) { val configurator = KotlinProjectConfigurator.EP_NAME.findExtension(KotlinAndroidGradleModuleConfigurator::class.java) - val nonConfiguredModules = project.allModules().excludeSourceRootModules().filter { - configurator.getStatus(it) == ConfigureKotlinStatus.CAN_BE_CONFIGURED - } + val nonConfiguredModules = getCanBeConfiguredModules(project, configurator) configurator.configureSilently(project, nonConfiguredModules, bundledRuntimeVersion()) }