jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-31 15:51:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed classes copying fail in cases when destinationDir has changed

Browse Source 
Added @Input to the property returning classes dirs: it will make
Gradle fall back to non-incremental input when the property value
changes.

Issues: #KT-16820 Fixed
This commit is contained in:
Sergey Igushkin
2017-03-24 15:33:07 +03:00
parent cc0ac36fed
commit 9ba84df954
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
View File

@@ -415,6 +415,42 @@ class KotlinGradleIT: BaseGradleIT() {
}
}
@Test
fun testChangeDestinationDir() {
val project = Project("kotlinProject", "3.3")
project.setupWorkingDir()
val fileToRemove = File(project.projectDir, "src/main/kotlin/removeMe.kt")
fileToRemove.writeText("val x = 1")
val classFilePath = "build/classes/main/RemoveMeKt.class"
project.build("build") {
assertSuccessful()
assertFileExists(classFilePath)
}
// Check that after the change the build succeeds and no stale classes remain in the java classes dir
File(project.projectDir, "build.gradle").modify {
"$it\n\ncompileKotlin.destinationDir = file(\"\${project.buildDir}/compileKotlin\")"
}
fileToRemove.delete()
project.build("build") {
assertSuccessful()
assertNoSuchFile(classFilePath)
// Check that the fallback to non-incremental copying was chosen
assertContains("Non-incremental copying files")
}
// Check that the classes are copied incrementally under normal conditions
fileToRemove.writeText("val x = 1")
project.build("build") {
assertSuccessful()
assertFileExists(classFilePath)
assertNotContains("Non-incremental copying files")
}
}
@Test
fun testDowngradeTo106() {
val project = Project("kotlinProject", GRADLE_VERSION)

5
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/SyncOutputTask.kt
View File

@@ -17,12 +17,13 @@
package org.jetbrains.kotlin.gradle.tasks
import org.gradle.api.DefaultTask
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputFiles
import org.gradle.api.tasks.OutputDirectory
import org.gradle.api.tasks.TaskAction
import org.gradle.api.tasks.incremental.IncrementalTaskInputs
import org.gradle.api.tasks.incremental.InputFileDetails
import org.jetbrains.kotlin.com.intellij.openapi.util.io.FileUtil.*
import org.jetbrains.kotlin.com.intellij.openapi.util.io.FileUtil.isAncestor
import org.jetbrains.kotlin.gradle.plugin.kotlinDebug
import java.io.File
import java.io.ObjectInputStream
@@ -59,6 +60,8 @@ internal open class SyncOutputTask : DefaultTask() {
@get:InputFiles
var kaptClassesDir: File by Delegates.notNull()
// Marked as input to make Gradle fall back to non-incremental build when it changes.
@get:Input
private val classesDirs: List<File>
get() = listOf(kotlinOutputDir, kaptClassesDir).filter(File::exists)