From 63a1bba6d9e5ae00d9ad1889cf4082a73b07fcb9 Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Mon, 25 Feb 2019 12:20:27 +0300 Subject: [PATCH] Fix importing compiler arguments if worker api is used #KT-29564 Fixed --- .../src/KotlinGradleModelBuilder.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt b/idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt index 1f4ac5d0231..4a821ff90a5 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt +++ b/idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt @@ -62,9 +62,14 @@ class KotlinGradleModelImpl( abstract class AbstractKotlinGradleModelBuilder : ModelBuilderService { companion object { - val kotlinCompileTaskClasses = listOf("org.jetbrains.kotlin.gradle.tasks.KotlinCompile_Decorated", - "org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile_Decorated", - "org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon_Decorated") + val kotlinCompileTaskClasses = listOf( + "org.jetbrains.kotlin.gradle.tasks.KotlinCompile_Decorated", + "org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile_Decorated", + "org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon_Decorated", + "org.jetbrains.kotlin.gradle.tasks.KotlinCompileWithWorkers_Decorated", + "org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompileWithWorkers_Decorated", + "org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommonWithWorkers_Decorated" + ) val platformPluginIds = listOf("kotlin-platform-jvm", "kotlin-platform-js", "kotlin-platform-common") val pluginToPlatform = linkedMapOf( "kotlin" to "kotlin-platform-jvm",