From 01e0bc8d5eb08a6007c6cd5903bbfecba7e42ec1 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 14 Oct 2016 17:09:47 +0300 Subject: [PATCH] Ensure task build directory always exist #KT-14253 fixed --- .../src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt2IT.kt | 2 +- .../main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt2IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt2IT.kt index ec411e6063a..0bb2f76d96f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt2IT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt2IT.kt @@ -74,7 +74,7 @@ class Kapt2IT: BaseGradleIT() { val project = Project("simple", GRADLE_VERSION, directoryPrefix = "kapt2") val classesDir = File(project.projectDir, "build/classes") - project.build("build", options = options) { + project.build("clean", "build", options = options) { assertSuccessful() assertKaptSuccessful() assertContains(":compileKotlin") diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index fa89944cb48..1b29e7e7b96 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -120,8 +120,8 @@ open class KotlinCompile : AbstractKotlinCompile(), Kotl private val sourceRoots = HashSet() - // lazy because name is probably not available when constructor is called - internal val taskBuildDirectory: File by lazy { File(File(project.buildDir, KOTLIN_BUILD_DIR_NAME), name).apply { mkdirs() } } + internal val taskBuildDirectory: File + get() = File(File(project.buildDir, KOTLIN_BUILD_DIR_NAME), name).apply { mkdirs() } private val cacheDirectory: File by lazy { File(taskBuildDirectory, CACHES_DIR_NAME) } private val dirtySourcesSinceLastTimeFile: File by lazy { File(taskBuildDirectory, DIRTY_SOURCES_FILE_NAME) } private val lastBuildInfoFile: File by lazy { File(taskBuildDirectory, LAST_BUILD_INFO_FILE_NAME) }