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

Kapt: Remove duplicating check, this also removes the senseless warning (KT-21425)

Browse Source
This commit is contained in:
Yan Zhulanow
2017-11-27 16:39:12 +09:00
committed by Yan Zhulanow
parent 4c96453a4b
commit d58665b5a8
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Plugin.kt
+7 -3
View File
@@ -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()
}