From 9eab9f386dde6249a996c8ce3bbf4c409eb86a4c Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 6 Jun 2019 20:16:58 +0900 Subject: [PATCH] Activate Kapt importer only for JVM compilations (KT-30578) --- idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt | 7 +++++-- .../kotlin/kapt/idea/KaptProjectResolverExtension.kt | 2 +- .../kotlin/kapt/idea/KaptProjectResolverExtension.kt.183 | 2 +- .../kotlin/kapt/idea/KaptProjectResolverExtension.kt.as33 | 2 +- .../kotlin/kapt/idea/KaptProjectResolverExtension.kt.as34 | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt b/idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt index b236fc10293..9418828f051 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt +++ b/idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt @@ -78,11 +78,14 @@ data class KotlinGradleModelImpl( abstract class AbstractKotlinGradleModelBuilder : ModelBuilderService { companion object { - val kotlinCompileTaskClasses = listOf( + val kotlinCompileJvmTaskClasses = listOf( "org.jetbrains.kotlin.gradle.tasks.KotlinCompile_Decorated", + "org.jetbrains.kotlin.gradle.tasks.KotlinCompileWithWorkers_Decorated" + ) + + val kotlinCompileTaskClasses = kotlinCompileJvmTaskClasses + listOf( "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" ) diff --git a/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt b/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt index 43ee32348cf..7e23bd99756 100644 --- a/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt +++ b/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt @@ -141,7 +141,7 @@ class KaptModelBuilderService : AbstractKotlinGradleModelBuilder() { if (kaptIsEnabled) { project.getAllTasks(false)[project]?.forEach { compileTask -> - if (compileTask.javaClass.name !in kotlinCompileTaskClasses) return@forEach + if (compileTask.javaClass.name !in kotlinCompileJvmTaskClasses) return@forEach val sourceSetName = compileTask.getSourceSetName() val isTest = sourceSetName.toLowerCase().endsWith("test") diff --git a/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.183 b/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.183 index 1287a980a94..a13345d26aa 100644 --- a/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.183 +++ b/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.183 @@ -172,7 +172,7 @@ class KaptModelBuilderService : AbstractKotlinGradleModelBuilder() { if (kaptIsEnabled) { project.getAllTasks(false)[project]?.forEach { compileTask -> - if (compileTask.javaClass.name !in kotlinCompileTaskClasses) return@forEach + if (compileTask.javaClass.name !in kotlinCompileJvmTaskClasses) return@forEach val sourceSetName = compileTask.getSourceSetName() val isTest = sourceSetName.toLowerCase().endsWith("test") diff --git a/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.as33 b/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.as33 index 43ee32348cf..7e23bd99756 100644 --- a/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.as33 +++ b/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.as33 @@ -141,7 +141,7 @@ class KaptModelBuilderService : AbstractKotlinGradleModelBuilder() { if (kaptIsEnabled) { project.getAllTasks(false)[project]?.forEach { compileTask -> - if (compileTask.javaClass.name !in kotlinCompileTaskClasses) return@forEach + if (compileTask.javaClass.name !in kotlinCompileJvmTaskClasses) return@forEach val sourceSetName = compileTask.getSourceSetName() val isTest = sourceSetName.toLowerCase().endsWith("test") diff --git a/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.as34 b/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.as34 index 43ee32348cf..7e23bd99756 100644 --- a/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.as34 +++ b/plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.as34 @@ -141,7 +141,7 @@ class KaptModelBuilderService : AbstractKotlinGradleModelBuilder() { if (kaptIsEnabled) { project.getAllTasks(false)[project]?.forEach { compileTask -> - if (compileTask.javaClass.name !in kotlinCompileTaskClasses) return@forEach + if (compileTask.javaClass.name !in kotlinCompileJvmTaskClasses) return@forEach val sourceSetName = compileTask.getSourceSetName() val isTest = sourceSetName.toLowerCase().endsWith("test")