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

Refactoring: remove extra property to pass stubs directory

Browse Source
This commit is contained in:
Alexey Tsvetkov
2016-07-22 15:26:53 +03:00
parent 92af1e9454
commit 54659fcacf
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt
+5 -6
View File
@@ -49,11 +49,11 @@ fun Project.initKapt(
kotlinTask.logger.kotlinDebug("kapt: Using class file stubs")
val stubsDir = File(buildDir, "tmp/kapt/$variantName/classFileStubs")
stubsDir.mkdirs()
kotlinTask.kaptOptions.classFileStubs = stubsDir
val stubsDir = File(buildDir, "tmp/kapt/$variantName/classFileStubs").apply { mkdirs() }
kotlinAfterJavaTask.destinationDir = kotlinTask.destinationDir
kotlinTask.destinationDir = stubsDir
kotlinTask.kaptOptions.generateStubs = true
javaTask.appendClasspathDynamically(stubsDir)
kotlinTask.appendClasspathDynamically(stubsDir)
val javaDestinationDir = project.files(javaTask.destinationDir)
javaTask.doLast {
@@ -105,10 +105,9 @@ private fun Project.createKotlinAfterJavaTask(
javaTask: AbstractCompile,
kotlinTask: KotlinCompile,
kotlinOptions: Any?,
destinationDir = kotlinTask.destinationDir
tasksProvider: KotlinTasksProvider
): KotlinCompile {
val kotlinAfterJavaTask = with (tasksProvider.createKotlinJVMTask(this, KOTLIN_AFTER_JAVA_TASK_SUFFIX)) {
val kotlinAfterJavaTask = with (tasksProvider.createKotlinJVMTask(this, kotlinTask.name + KOTLIN_AFTER_JAVA_TASK_SUFFIX)) {
classpath = kotlinTask.classpath - project.files(javaTask.destinationDir)
this
}