From 7561b433369fb05a22f452a9dbbfb2af94fe35b1 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 9 Jun 2015 18:36:41 +0300 Subject: [PATCH] kapt: Warn on using android-apt with kapt --- .../kotlin/gradle/internal/AnnotationProcessingManager.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt index ec3640b9553..e415bd007c5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt @@ -42,6 +42,8 @@ public class AnnotationProcessingManager( val JAVA_FQNAME_PATTERN = "^([\\p{L}_$][\\p{L}\\p{N}_$]*\\.)*[\\p{L}_$][\\p{L}\\p{N}_$]*$".toRegex() val WRAPPERS_DIRECTORY = "wrappers" val GEN_ANNOTATION = "__gen/annotation" + + private val ANDROID_APT_PLUGIN_ID = "com.neenbedankt.android-apt" } fun getAnnotationFile(): File { @@ -52,6 +54,10 @@ public class AnnotationProcessingManager( fun setupKapt() { if (aptFiles.isEmpty()) return + if (project.getPlugins().findPlugin("com.neenbedankt.android-apt") != null) { + project.getLogger().warn("Please do not use `$ANDROID_APT_PLUGIN_ID` with kapt.") + } + generateJavaHackFile(aptWorkingDir, javaTask) val annotationProcessorFqNames = lookupAnnotationProcessors(aptFiles)