From d58665b5a82ae7f8619b84457176f5c4d115bd04 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Mon, 27 Nov 2017 16:39:12 +0900 Subject: [PATCH] Kapt: Remove duplicating check, this also removes the senseless warning (KT-21425) --- .../gradle/internal/Kapt3KotlinGradleSubplugin.kt | 3 --- .../src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt | 10 +++++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt index 0d8ddad3b7f..21f71c62a22 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt @@ -203,9 +203,6 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin { pluginOptions += SubpluginOption("aptMode", aptMode) disableAnnotationProcessingInJavaTask() - // Skip annotation processing in kotlinc if no kapt dependencies were provided - if (kaptClasspath.isEmpty()) return pluginOptions - kaptClasspath.forEach { pluginOptions += SubpluginOption("apclasspath", it.absolutePath) } javaCompile.source(generatedFilesDir) diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt index 56b79dd8a4d..c911b955c56 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt @@ -218,14 +218,18 @@ class Kapt3ComponentRegistrar : ComponentRegistrar { val annotationProcessors = configuration.get(Kapt3ConfigurationKeys.ANNOTATION_PROCESSORS) ?: "" - val apClasspath = configuration.get(ANNOTATION_PROCESSOR_CLASSPATH)?.map(::File) + val apClasspath = configuration.get(ANNOTATION_PROCESSOR_CLASSPATH)?.map(::File) ?: emptyList() - if (sourcesOutputDir == null || classFilesOutputDir == null || apClasspath == null || stubsOutputDir == null) { + if (apClasspath.isEmpty()) { + // Skip annotation processing if no annotation processors were provided + return + } + + if (sourcesOutputDir == null || classFilesOutputDir == null || stubsOutputDir == null) { if (aptMode != AptMode.WITH_COMPILATION) { val nonExistentOptionName = when { sourcesOutputDir == null -> "Sources output directory" classFilesOutputDir == null -> "Classes output directory" - apClasspath == null -> "Annotation processing classpath" stubsOutputDir == null -> "Stubs output directory" else -> throw IllegalStateException() }