diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CacheVersionChangedIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CacheVersionChangedIT.kt deleted file mode 100644 index a4eab2ea64e..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CacheVersionChangedIT.kt +++ /dev/null @@ -1,53 +0,0 @@ -package org.jetbrains.kotlin.gradle - -import org.junit.Test -import java.io.File -import kotlin.test.assertNotEquals -import kotlin.test.assertTrue - -class CacheVersionChangedIT : BaseGradleIT() { - @Test - fun testGradleCacheVersionChanged() { - compileIncrementallyWithChangedVersion("gradle-format-version.txt") - } - - @Test - fun testNormalCacheVersionChanged() { - compileIncrementallyWithChangedVersion("format-version.txt") - } - @Test - fun testDataContainerCacheVersionChanged() { - compileIncrementallyWithChangedVersion("data-container-format-version.txt") - } - - private fun compileIncrementallyWithChangedVersion(versionFileName: String) { - val project = Project("kotlinProject", "2.10") - val options = defaultBuildOptions().copy(incremental = true) - - fun File.projectPath() = relativeTo(project.projectDir).path - - project.build("build", options = options) { - assertSuccessful() - } - - val versionFile = File(project.projectDir, "build/kotlin/compileKotlin/$versionFileName") - assertTrue(versionFile.exists(), "${versionFile.projectPath()} does not exist!") - val modifiedVersion = "777" - versionFile.writeText(modifiedVersion) - - project.build("build", options = options) { - assertSuccessful() - assertNotEquals(modifiedVersion, versionFile.readText(), "${versionFile.projectPath()} was not rewritten by build") - - val mainDir = File(project.projectDir, "src/main") - val mainKotlinFiles = mainDir.walk().filter { it.isFile && it.extension.equals("kt", ignoreCase = true) } - val mainKotlinRelativePaths = mainKotlinFiles.map(File::projectPath).toList() - assertCompiledKotlinSources(mainKotlinRelativePaths) - } - - project.build("build", options = options) { - assertSuccessful() - assertCompiledKotlinSources(listOf(), weakTesting = false) - } - } -} \ No newline at end of file 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 0b0e8586b81..dcb25b726d3 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 @@ -77,12 +77,6 @@ abstract class AbstractKotlinCompile() : AbstractKo internal val taskBuildDirectory: File get() = File(File(project.buildDir, KOTLIN_BUILD_DIR_NAME), name).apply { mkdirs() } - private val cacheVersions: List - get() = - listOf(normalCacheVersion(taskBuildDirectory, enabled = incremental), - dataContainerCacheVersion(taskBuildDirectory, enabled = incremental), - gradleCacheVersion(taskBuildDirectory, enabled = incremental)) - // indicates that task should compile kotlin incrementally if possible // it's not possible when IncrementalTaskInputs#isIncremental returns false (i.e first build) var incremental: Boolean = false @@ -92,13 +86,6 @@ abstract class AbstractKotlinCompile() : AbstractKo logger.kotlinDebug { "Set $this.incremental=$value" } } - internal val isCacheFormatUpToDate: Boolean - get() { - if (!incremental) return true - - return cacheVersions.all { it.checkVersion() == CacheVersion.Action.DO_NOTHING } - } - abstract protected fun createCompilerArgs(): T internal val pluginOptions = CompilerPluginOptions() diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt index 03611f9efdc..93d47370b87 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksProvider.kt @@ -41,7 +41,6 @@ internal open class KotlinTasksProvider { this.sourceSetName = sourceSetName this.friendTaskName = taskToFriendTaskMapper[this] mapKotlinTaskProperties(project, this) - outputs.upToDateWhen { isCacheFormatUpToDate } } protected open val taskToFriendTaskMapper: TaskToFriendTaskMapper =