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

Activate Kapt importer only for JVM compilations (KT-30578)

Browse Source
This commit is contained in:
Yan Zhulanow
2019-06-06 20:16:58 +09:00
parent d9dca067f6
commit 9eab9f386d
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/kotlin-gradle-tooling/src/KotlinGradleModelBuilder.kt
+5 -2
View File
@@ -78,11 +78,14 @@ data class KotlinGradleModelImpl(
abstract class AbstractKotlinGradleModelBuilder : ModelBuilderService { abstract class AbstractKotlinGradleModelBuilder : ModelBuilderService {
companion object { companion object {
val kotlinCompileTaskClasses = listOf( val kotlinCompileJvmTaskClasses = listOf(
"org.jetbrains.kotlin.gradle.tasks.KotlinCompile_Decorated", "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.Kotlin2JsCompile_Decorated",
"org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon_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.Kotlin2JsCompileWithWorkers_Decorated",
"org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommonWithWorkers_Decorated" "org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommonWithWorkers_Decorated"
) )
plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt
+1 -1
View File
@@ -141,7 +141,7 @@ class KaptModelBuilderService : AbstractKotlinGradleModelBuilder() {
if (kaptIsEnabled) { if (kaptIsEnabled) {
project.getAllTasks(false)[project]?.forEach { compileTask -> 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 sourceSetName = compileTask.getSourceSetName()
val isTest = sourceSetName.toLowerCase().endsWith("test") val isTest = sourceSetName.toLowerCase().endsWith("test")
plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.183
+1 -1
View File
@@ -172,7 +172,7 @@ class KaptModelBuilderService : AbstractKotlinGradleModelBuilder() {
if (kaptIsEnabled) { if (kaptIsEnabled) {
project.getAllTasks(false)[project]?.forEach { compileTask -> 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 sourceSetName = compileTask.getSourceSetName()
val isTest = sourceSetName.toLowerCase().endsWith("test") val isTest = sourceSetName.toLowerCase().endsWith("test")
plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.as33
+1 -1
View File
@@ -141,7 +141,7 @@ class KaptModelBuilderService : AbstractKotlinGradleModelBuilder() {
if (kaptIsEnabled) { if (kaptIsEnabled) {
project.getAllTasks(false)[project]?.forEach { compileTask -> 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 sourceSetName = compileTask.getSourceSetName()
val isTest = sourceSetName.toLowerCase().endsWith("test") val isTest = sourceSetName.toLowerCase().endsWith("test")
plugins/kapt3/kapt3-idea/src/org/jetbrains/kotlin/kapt/idea/KaptProjectResolverExtension.kt.as34
+1 -1
View File
@@ -141,7 +141,7 @@ class KaptModelBuilderService : AbstractKotlinGradleModelBuilder() {
if (kaptIsEnabled) { if (kaptIsEnabled) {
project.getAllTasks(false)[project]?.forEach { compileTask -> 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 sourceSetName = compileTask.getSourceSetName()
val isTest = sourceSetName.toLowerCase().endsWith("test") val isTest = sourceSetName.toLowerCase().endsWith("test")