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

Kapt: Fix Gradle input/output verification

Browse Source
This commit is contained in:
Yan Zhulanow
2018-05-25 00:07:44 +03:00
parent 8645be3ace
commit bf10c1162a
1 changed files with 3 additions and 8 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/kapt/KaptTask.kt
+3 -8
View File
@@ -1,16 +1,10 @@
package org.jetbrains.kotlin.gradle.internal
import org.gradle.api.GradleException
import com.intellij.openapi.util.io.FileUtil
import org.gradle.api.artifacts.Configuration
import org.gradle.api.file.FileCollection
import org.gradle.api.internal.ConventionTask
import org.gradle.api.tasks.*
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.compilerRunner.GradleCompilerEnvironment
import org.jetbrains.kotlin.compilerRunner.GradleCompilerRunner
import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl
import org.jetbrains.kotlin.gradle.plugin.compareVersionNumbers
import org.jetbrains.kotlin.gradle.plugin.PLUGIN_CLASSPATH_CONFIGURATION_NAME
import org.jetbrains.kotlin.gradle.tasks.*
import org.jetbrains.kotlin.gradle.utils.isJavaFile
import org.jetbrains.kotlin.gradle.utils.isParentOf
@@ -18,7 +12,7 @@ import org.jetbrains.kotlin.gradle.utils.toSortedPathsArray
import java.io.File
@CacheableTask
open class KaptTask : ConventionTask() {
abstract class KaptTask : ConventionTask() {
init {
cacheOnlyIfEnabledForKotlin()
@@ -74,6 +68,7 @@ open class KaptTask : ConventionTask() {
return result
}
@get:Internal
protected val javaSourceRoots: Set<File>
get() = (kotlinCompileTask.sourceRootsContainer.sourceRoots + stubsDir)
.filterTo(HashSet(), ::isRootAllowed)