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

Fix Kotlin internal files created in 'build/' ignoring custom buildDir

Browse Source 
Issue #KT-10537 Fixed
This commit is contained in:
Sergey Igushkin
2017-11-30 20:50:44 +03:00
parent 953a485fe7
commit 01931c2ae6
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
+1 -2
View File
@@ -184,8 +184,6 @@ class SimpleKotlinGradleIT : BaseGradleIT() {
val project = Project("kotlinProject", GRADLE_VERSION) val project = Project("kotlinProject", GRADLE_VERSION)
project.setupWorkingDir() project.setupWorkingDir()
File(project.projectDir, "build").writeText("This file prevents Gradle from using 'build' as a directory")
// Change the build directory in the end of the build script: // Change the build directory in the end of the build script:
val customBuildDirName = "customBuild" val customBuildDirName = "customBuild"
File(project.projectDir, "build.gradle").modify { File(project.projectDir, "build.gradle").modify {
@@ -195,6 +193,7 @@ class SimpleKotlinGradleIT : BaseGradleIT() {
project.build("build") { project.build("build") {
assertSuccessful() assertSuccessful()
assertFileExists("$customBuildDirName/classes") assertFileExists("$customBuildDirName/classes")
assertNoSuchFile("build")
} }
} }
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+1 -1
View File
@@ -262,7 +262,7 @@ open class KotlinCompile : AbstractKotlinCompile<K2JVMCompilerArguments>(), Kotl
private var kaptAnnotationsFileUpdater: AnnotationFileUpdater? = null private var kaptAnnotationsFileUpdater: AnnotationFileUpdater? = null
@get:Internal @get:Internal
val buildHistoryFile: File = File(taskBuildDirectory, "build-history.bin") val buildHistoryFile: File get() = File(taskBuildDirectory, "build-history.bin")
@get:Internal @get:Internal
val kaptOptions = KaptOptions() val kaptOptions = KaptOptions()