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

Kapt3, Gradle: Fix kapt execution in tests. Check filtered dependencies list properly (KT-15459)

Browse Source
This commit is contained in:
Yan Zhulanow
2017-01-12 01:08:24 +09:00
committed by Yan Zhulanow
parent ec291455fa
commit 50a7164efe
1 changed files with 5 additions and 1 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/Kapt3KotlinGradleSubplugin.kt
+5 -1
View File
@@ -97,7 +97,11 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
fun handleSourceSet(sourceSetName: String) {
val kaptConfiguration = project.findKaptConfiguration(sourceSetName)
if (kaptConfiguration != null && kaptConfiguration.dependencies.size > 1) {
val filteredDependencies = kaptConfiguration?.dependencies?.filter {
it.group != getGroupName() || it.name != getArtifactName()
} ?: emptyList()
if (kaptConfiguration != null && filteredDependencies.isNotEmpty()) {
javaCompile.dependsOn(kaptConfiguration.buildDependencies)
kaptClasspath.addAll(kaptConfiguration.resolve())
}