Refactoring: use daemon by default in gradle tests

libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt

@@ -14,9 +14,8 @@ abstract class AbstractKotlinAndroidGradleTests(
 ) : BaseGradleIT() {
 
     override fun defaultBuildOptions() =
-            BuildOptions(withDaemon = true,
+            super.defaultBuildOptions().copy(androidHome = File("../../../dependencies/android-sdk-for-tests"),
-                         androidHome = File("../../../dependencies/android-sdk-for-tests"),
+                                             androidGradlePluginVersion = androidGradlePluginVersion)
-                         androidGradlePluginVersion = androidGradlePluginVersion)
 
 
 

libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt

@@ -20,7 +20,7 @@ abstract class BaseGradleIT {
 
     protected var workingDir = File(".")
 
-    protected open fun defaultBuildOptions(): BuildOptions = BuildOptions(withDaemon = false)
+    protected open fun defaultBuildOptions(): BuildOptions = BuildOptions(withDaemon = true)
 
     @Before
     fun setUp() {

libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt

@@ -1,12 +1,11 @@
 package org.jetbrains.kotlin.gradle
 
-import org.gradle.api.logging.LogLevel
 import org.junit.Test
 
 class SimpleKotlinGradleIT : BaseGradleIT() {
 
     companion object {
-        private val GRADLE_VERSION = "2.3"
+        private const val GRADLE_VERSION = "2.10"
     }
 
     @Test

libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIT.kt

@@ -12,9 +12,6 @@ class KaptIT: BaseGradleIT() {
         private const val GRADLE_VERSION = "2.14.1"
     }
 
-    override fun defaultBuildOptions(): BuildOptions =
-            super.defaultBuildOptions().copy(withDaemon = true)
-
     @Test
     fun testSimple() {
         val project = Project("kaptSimple", GRADLE_VERSION)

libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalIT.kt

@@ -28,7 +28,7 @@ abstract class KaptIncrementalBaseIT(val shouldUseStubs: Boolean): BaseGradleIT(
             arrayOf("A", "funA", "valA", "funUtil", "valUtil", "B", "funB", "valB", "useB")
 
     override fun defaultBuildOptions(): BuildOptions =
-            super.defaultBuildOptions().copy(withDaemon = true, incremental = true)
+            super.defaultBuildOptions().copy(incremental = true)
 
     @Test
     fun testBasic() {

libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt

@@ -16,9 +16,6 @@ class KotlinGradleIT: BaseGradleIT() {
         private const val GRADLE_VERSION = "2.10"
     }
 
-    override fun defaultBuildOptions(): BuildOptions =
-            super.defaultBuildOptions().copy(withDaemon = true)
-
     @Test
     fun testCrossCompile() {
         val project = Project("kotlinJavaProject", GRADLE_VERSION)

libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginJpsParametrizedCLIOnly.kt

@@ -40,8 +40,8 @@ class KotlinGradlePluginJpsParametrizedCLIOnly : BaseIncrementalGradleIT() {
         JpsTestProject(buildLogFinder, jpsResourcesPath, relativePath).performAndAssertBuildStages(weakTesting = true)
     }
 
-    override fun defaultBuildOptions(): BuildOptions =
+    override fun defaultBuildOptions() =
-            BuildOptions(withDaemon = true, incremental = true)
+            super.defaultBuildOptions().copy(incremental = true)
 
     companion object {