From 8d189bae55c3e4dc20ad2d1846c25e0e2e6bfc3b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 27 Apr 2016 15:15:04 +0300 Subject: [PATCH] Refactoring: rename javaAptSourceDir->hackAnnotationDir --- .../kotlin/gradle/internal/AnnotationProcessingManager.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 745661cf616..1446d7851d5 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 @@ -69,7 +69,7 @@ fun Project.initKapt( } javaTask.appendClasspathDynamically(kaptManager.wrappersDirectory) - javaTask.source(kaptManager.javaAptSourceDir) + javaTask.source(kaptManager.hackAnnotationDir) if (kaptExtension.inheritedAnnotations) { kotlinTask.extensions.extraProperties.set("kaptInheritedAnnotations", true) @@ -138,7 +138,7 @@ public class AnnotationProcessingManager( private val project = task.project private val random = Random() val wrappersDirectory = File(aptWorkingDir, "wrappers") - val javaAptSourceDir = File(aptWorkingDir, "java_src") + val hackAnnotationDir = File(aptWorkingDir, "java_src") private companion object { val JAVA_FQNAME_PATTERN = "^([\\p{L}_$][\\p{L}\\p{N}_$]*\\.)*[\\p{L}_$][\\p{L}\\p{N}_$]*$".toRegex() @@ -191,7 +191,7 @@ public class AnnotationProcessingManager( } fun generateJavaHackFile() { - val javaHackPackageDir = File(javaAptSourceDir, GEN_ANNOTATION) + val javaHackPackageDir = File(hackAnnotationDir, GEN_ANNOTATION) if (!javaHackPackageDir.exists()) javaHackPackageDir.mkdirs()