From fe3ce1ec7cdd29a1839f3dd67e0a00023efa495d Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Wed, 14 Feb 2018 14:42:44 +0300 Subject: [PATCH] (minor) Fix `testKaptKt15814`, slightly modify temp dir path. --- .../jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt | 2 ++ .../src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt index c7f1f0335e2..cbbbf252ccd 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt @@ -186,6 +186,8 @@ fun getSomething() = 10 @Test fun testKaptKt15814() { val project = Project("kaptKt15814", gradleVersion) + project.allowOriginalKapt() + val options = defaultBuildOptions().copy(incremental = false) project.build("assembleDebug", "test", options = options) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index e4cf8f05b13..62549d68918 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -120,7 +120,7 @@ abstract class BaseGradleIT { } private fun createNewWrapperDir(version: String): File = - createTempDir("GradleWrapper-$version") + createTempDir("GradleWrapper-$version-") .apply { File(BaseGradleIT.resourcesRootFile, "GradleWrapper").copyRecursively(this) val wrapperProperties = File(this, "gradle/wrapper/gradle-wrapper.properties")