diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheIT.kt index f6c4faa2b8f..5b8eb6f8727 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheIT.kt @@ -189,7 +189,7 @@ class BuildCacheIT : KGPBaseTest() { // Change the return type of foo() from Int to String in foo.kt, and check that fooUsage.kt is recompiled as well: val fooKtSourceFile = secondProject.projectPath.resolve("src/main/kotlin/foo.kt") fooKtSourceFile.modify { it.replace("Int = 1", "String = \"abc\"") } - secondProject.build("assemble", forceOutput = true) { + secondProject.build("assemble") { assertIncrementalCompilation(modifiedFiles = setOf(fooKtSourceFile)) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt index 7a06c7824f6..6c3e87ddac0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJavaToolchainTest.kt @@ -116,7 +116,7 @@ class KotlinJavaToolchainTest : KGPBaseTest() { enableLocalBuildCache(buildCache) useToolchainExtension(11) - build("assemble", forceOutput = true, enableBuildCacheDebug = true) + build("assemble") } project( @@ -129,7 +129,7 @@ class KotlinJavaToolchainTest : KGPBaseTest() { enableLocalBuildCache(buildCache) useToolchainExtension(11) - build("assemble", enableBuildCacheDebug = true) { + build("assemble") { assertTasksFromCache(":compileKotlin") } } @@ -146,7 +146,6 @@ class KotlinJavaToolchainTest : KGPBaseTest() { buildOptions = defaultBuildOptions.copy(buildCacheEnabled = true) ) { enableLocalBuildCache(buildCache) - enableBuildCacheDebug() if (shouldUseToolchain(gradleVersion)) { useToolchainExtension(11) } else { @@ -166,7 +165,6 @@ class KotlinJavaToolchainTest : KGPBaseTest() { buildOptions = defaultBuildOptions.copy(buildCacheEnabled = true) ) { enableLocalBuildCache(buildCache) - enableBuildCacheDebug() build("assemble") { assertTasksExecuted(":compileKotlin") } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt index aa8ff813b66..ff0e7e5d3af 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt @@ -151,12 +151,6 @@ fun TestProject.enableLocalBuildCache( ) } -fun TestProject.enableBuildCacheDebug() { - gradleProperties.append( - "org.gradle.caching.debug=true" - ) -} - class TestProject( val gradleRunner: GradleRunner, val projectName: String,