From 3df6d63580f210540cbbea484b5902fd71773d99 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Sat, 9 Jun 2018 00:19:17 +0300 Subject: [PATCH] Minor: Fix compilation after unsuccessful rebase. Add back the isMultiplatformModule() method --- .../android/AndroidGradleOrderEnumerationHandler.kt | 8 +++++++- .../idea/run/MultiplatformGradleProjectTaskRunner.kt | 0 2 files changed, 7 insertions(+), 1 deletion(-) delete mode 100644 idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/MultiplatformGradleProjectTaskRunner.kt diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/AndroidGradleOrderEnumerationHandler.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/AndroidGradleOrderEnumerationHandler.kt index 9d5e620409d..61cc0965b28 100644 --- a/idea/idea-android/src/org/jetbrains/kotlin/android/AndroidGradleOrderEnumerationHandler.kt +++ b/idea/idea-android/src/org/jetbrains/kotlin/android/AndroidGradleOrderEnumerationHandler.kt @@ -14,8 +14,9 @@ import com.intellij.openapi.roots.ModuleRootModel import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.vfs.VfsUtilCore import org.jetbrains.android.facet.AndroidFacet +import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider +import org.jetbrains.kotlin.config.TargetPlatformKind import org.jetbrains.kotlin.idea.facet.KotlinFacet -import org.jetbrains.kotlin.idea.run.isMultiplatformModule import org.jetbrains.plugins.gradle.execution.GradleOrderEnumeratorHandler import org.jetbrains.plugins.gradle.model.ExternalSourceDirectorySet import org.jetbrains.plugins.gradle.service.project.data.ExternalProjectDataCache @@ -93,4 +94,9 @@ class AndroidGradleOrderEnumerationHandler(module: Module) : GradleOrderEnumerat override fun createHandler(module: Module) = AndroidGradleOrderEnumerationHandler(module) } +} + +private fun Module.isMultiplatformModule(): Boolean { + val settings = KotlinFacetSettingsProvider.getInstance(project).getInitializedSettings(this) + return settings.targetPlatformKind is TargetPlatformKind.Common || settings.implementedModuleNames.isNotEmpty() } \ No newline at end of file diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/MultiplatformGradleProjectTaskRunner.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/MultiplatformGradleProjectTaskRunner.kt deleted file mode 100644 index e69de29bb2d..00000000000