Kapt: Consider all 'kapt' configuration dependencies as KaptTask dependencies.
This commit is contained in:
committed by
Yan Zhulanow
parent
6941065e2c
commit
1af93b8342
+4
@@ -138,6 +138,7 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
|
||||
|
||||
val kaptClasspath = arrayListOf<File>()
|
||||
val buildDependencies = arrayListOf<TaskDependency>()
|
||||
val kaptConfigurations = arrayListOf<Configuration>()
|
||||
|
||||
fun handleSourceSet(sourceSetName: String) {
|
||||
val kaptConfiguration = project.findKaptConfiguration(sourceSetName)
|
||||
@@ -146,6 +147,7 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
|
||||
} ?: emptyList()
|
||||
|
||||
if (kaptConfiguration != null) {
|
||||
kaptConfigurations += kaptConfiguration
|
||||
buildDependencies += kaptConfiguration.buildDependencies
|
||||
|
||||
if (filteredDependencies.isNotEmpty()) {
|
||||
@@ -178,6 +180,8 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
|
||||
val kaptGenerateStubsTask = context.createKaptGenerateStubsTask()
|
||||
val kaptTask = context.createKaptKotlinTask()
|
||||
|
||||
kaptGenerateStubsTask.source(*kaptConfigurations.toTypedArray())
|
||||
|
||||
kaptGenerateStubsTask.dependsOn(*buildDependencies.toTypedArray())
|
||||
kaptGenerateStubsTask.dependsOn(*kotlinCompile.dependsOn.toTypedArray())
|
||||
|
||||
|
||||
Reference in New Issue
Block a user