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

Revert "Kapt3: Add generated source files to Java compile task after kapt execution. Filter only .java files."

Browse Source 
This reverts commit 82c2ce3a336b8d15161ecb6dbad0c269c9966818.
This commit is contained in:
Yan Zhulanow
2017-02-14 20:51:02 +03:00
committed by Yan Zhulanow
parent 35b41b9401
commit 8e9536f61d
2 changed files with 5 additions and 4 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
+3 -1
View File
@@ -160,6 +160,8 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
kaptClasspath.forEach { pluginOptions += SubpluginOption("apclasspath", it.absolutePath) } kaptClasspath.forEach { pluginOptions += SubpluginOption("apclasspath", it.absolutePath) }
javaCompile.source(generatedFilesDir)
pluginOptions += SubpluginOption("sources", generatedFilesDir.canonicalPath) pluginOptions += SubpluginOption("sources", generatedFilesDir.canonicalPath)
pluginOptions += SubpluginOption("classes", getKaptClasssesDir(project, sourceSetName).canonicalPath) pluginOptions += SubpluginOption("classes", getKaptClasssesDir(project, sourceSetName).canonicalPath)
@@ -218,7 +220,6 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
val kaptTaskName = kotlinCompile.name.replaceFirst("compile", "kapt") val kaptTaskName = kotlinCompile.name.replaceFirst("compile", "kapt")
val kaptTask = project.tasks.create(kaptTaskName, KaptTask::class.java) val kaptTask = project.tasks.create(kaptTaskName, KaptTask::class.java)
kaptTask.kotlinCompileTask = kotlinCompile kaptTask.kotlinCompileTask = kotlinCompile
kaptTask.javaCompileTask = javaCompile
kotlinToKaptTasksMap[kotlinCompile] = kaptTask kotlinToKaptTasksMap[kotlinCompile] = kaptTask
project.resolveSubpluginArtifacts(listOf(this@Kapt3KotlinGradleSubplugin)).flatMap { it.value }.forEach { project.resolveSubpluginArtifacts(listOf(this@Kapt3KotlinGradleSubplugin)).flatMap { it.value }.forEach {
@@ -233,6 +234,7 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
// Add generated source dir as a source root for kotlinCompile and javaCompile // Add generated source dir as a source root for kotlinCompile and javaCompile
kotlinCompile.source(sourcesOutputDir) kotlinCompile.source(sourcesOutputDir)
javaCompile.source(sourcesOutputDir)
variantData?.let { variantData?.let {
if (AndroidGradleWrapper.isJackEnabled(it)) { if (AndroidGradleWrapper.isJackEnabled(it)) {
AndroidGradleWrapper.addSourceToJack(it, sourcesOutputDir) AndroidGradleWrapper.addSourceToJack(it, sourcesOutputDir)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt
+2 -3
View File
@@ -15,6 +15,8 @@ import org.jetbrains.kotlin.gradle.tasks.*
import org.jetbrains.kotlin.incremental.classpathAsList import org.jetbrains.kotlin.incremental.classpathAsList
import org.jetbrains.kotlin.incremental.destinationAsFile import org.jetbrains.kotlin.incremental.destinationAsFile
import java.io.File import java.io.File
import java.net.URLDecoder
import java.nio.charset.Charset
open class KaptTask : AbstractCompile() { open class KaptTask : AbstractCompile() {
private val rawSourceRoots = FilteringSourceRootsContainer({ !it.isInsideDestinationDir() }) private val rawSourceRoots = FilteringSourceRootsContainer({ !it.isInsideDestinationDir() })
@@ -22,7 +24,6 @@ open class KaptTask : AbstractCompile() {
internal val pluginOptions = CompilerPluginOptions() internal val pluginOptions = CompilerPluginOptions()
internal lateinit var kotlinCompileTask: KotlinCompile internal lateinit var kotlinCompileTask: KotlinCompile
internal lateinit var javaCompileTask: AbstractCompile
override fun setSource(sources: Any?) { override fun setSource(sources: Any?) {
val filteredSources = rawSourceRoots.set(sources) val filteredSources = rawSourceRoots.set(sources)
@@ -74,7 +75,5 @@ open class KaptTask : AbstractCompile() {
val compilerRunner = GradleCompilerRunner(project) val compilerRunner = GradleCompilerRunner(project)
val exitCode = compilerRunner.runJvmCompiler(sourceRoots.kotlinSourceFiles, sourceRoots.javaSourceRoots, args, environment) val exitCode = compilerRunner.runJvmCompiler(sourceRoots.kotlinSourceFiles, sourceRoots.javaSourceRoots, args, environment)
throwGradleExceptionIfError(exitCode) throwGradleExceptionIfError(exitCode)
javaCompileTask.source(destinationDir.walkTopDown().filter { it.extension == "java" }.toList())
} }
} }