diff --git a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJvmCache.kt b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJvmCache.kt index 832b592caa3..34a21c25a27 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJvmCache.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJvmCache.kt @@ -23,10 +23,7 @@ import com.intellij.util.io.EnumeratorStringDescriptor import gnu.trove.THashSet import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.build.GeneratedJvmClass -import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.incremental.storage.* -import org.jetbrains.kotlin.incremental.storage.version.clean -import org.jetbrains.kotlin.incremental.storage.version.localCacheVersionManager import org.jetbrains.kotlin.inline.inlineFunctionsJvmNames import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache @@ -264,11 +261,6 @@ open class IncrementalJvmCache( return protoMap[JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME)]?.bytes } - override fun clean() { - super.clean() - localCacheVersionManager(targetDataRoot, IncrementalCompilation.isEnabledForJvm()).clean() - } - private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, ProtoMapValueExternalizer) { fun process(kotlinClass: LocalFileKotlinClass, changesCollector: ChangesCollector) { diff --git a/build-common/src/org/jetbrains/kotlin/incremental/storage/version/lookups.kt b/build-common/src/org/jetbrains/kotlin/incremental/storage/version/lookups.kt index bd8fdd78c04..601fe404617 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/storage/version/lookups.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/version/lookups.kt @@ -14,7 +14,4 @@ fun lookupsCacheVersionManager(dataRoot: File, isEnabled: Boolean) = CacheVersionManager( File(dataRoot, DATA_CONTAINER_VERSION_FILE_NAME), if (isEnabled) DATA_CONTAINER_VERSION else null - ) - -fun readLookupsCacheStatus(dataRoot: File, isEnabled: Boolean): CacheStatus = - lookupsCacheVersionManager(dataRoot, isEnabled).loadAndCheckStatus() \ No newline at end of file + ) \ No newline at end of file diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt index 4db2aaf54c6..2a6b8f90236 100644 --- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt +++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt @@ -510,17 +510,9 @@ class CompileServiceImpl( } val workingDir = incrementalCompilationOptions.workingDir - val versionManagers = commonCacheVersionsManagers(workingDir, enabled = true) + - customCacheVersionManager( - incrementalCompilationOptions.customCacheVersion, - incrementalCompilationOptions.customCacheVersionFileName, - workingDir, - enabled = true - ) val modulesApiHistory = ModulesApiHistoryJs(incrementalCompilationOptions.modulesInfo) val compiler = IncrementalJsCompilerRunner( workingDir = workingDir, - cachesVersionManagers = versionManagers, reporter = reporter, buildHistoryFile = incrementalCompilationOptions.multiModuleICSettings.buildHistoryFile, modulesApiHistory = modulesApiHistory @@ -576,13 +568,6 @@ class CompileServiceImpl( } val workingDir = incrementalCompilationOptions.workingDir - val versions = commonCacheVersionsManagers(workingDir, enabled = true) + - customCacheVersionManager( - incrementalCompilationOptions.customCacheVersion, - incrementalCompilationOptions.customCacheVersionFileName, - workingDir, - enabled = true - ) val modulesApiHistory = incrementalCompilationOptions.run { if (!multiModuleICSettings.useModuleDetection) { @@ -595,7 +580,6 @@ class CompileServiceImpl( val compiler = IncrementalJvmCompilerRunner( workingDir, javaSourceRoots, - versions, reporter, buildHistoryFile = incrementalCompilationOptions.multiModuleICSettings.buildHistoryFile, localStateDirs = incrementalCompilationOptions.localStateDirs, diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt index 78443205fc5..7d9ce1b9524 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.incremental.components.ExpectActualTracker import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.parsing.classesFqNames -import org.jetbrains.kotlin.incremental.storage.version.CacheVersionManager import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.progress.CompilationCanceledStatus import java.io.File @@ -41,7 +40,6 @@ abstract class IncrementalCompilerRunner< >( workingDir: File, cacheDirName: String, - protected val cachesVersionManagers: List, protected val reporter: ICReporter, private val buildHistoryFile: File, private val localStateDirs: Collection = emptyList() @@ -270,10 +268,6 @@ abstract class IncrementalCompilerRunner< val dirtyData = DirtyData(buildDirtyLookupSymbols, buildDirtyFqNames) processChangesAfterBuild(compilationMode, currentBuildInfo, dirtyData) - if (exitCode == ExitCode.OK) { - cachesVersionManagers.forEach { it.writeVersion() } - } - return exitCode } diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt index 0367f191803..38d9d12164e 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunner.kt @@ -26,7 +26,6 @@ import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.incremental.components.ExpectActualTracker import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.js.* -import org.jetbrains.kotlin.incremental.storage.version.CacheVersionManager import org.jetbrains.kotlin.incremental.multiproject.EmptyModulesApiHistory import org.jetbrains.kotlin.incremental.multiproject.ModulesApiHistory import java.io.File @@ -43,10 +42,8 @@ fun makeJsIncrementally( val buildHistoryFile = File(cachesDir, "build-history.bin") withJsIC { - val versions = commonCacheVersionsManagers(cachesDir, true) + standaloneCacheVersionManager(cachesDir, true) - val compiler = IncrementalJsCompilerRunner( - cachesDir, versions, reporter, + cachesDir, reporter, buildHistoryFile = buildHistoryFile, modulesApiHistory = EmptyModulesApiHistory) compiler.compile(allKotlinFiles, args, messageCollector, providedChangedFiles = null) @@ -66,14 +63,12 @@ inline fun withJsIC(fn: () -> R): R { class IncrementalJsCompilerRunner( workingDir: File, - cachesVersionManagers: List, reporter: ICReporter, buildHistoryFile: File, private val modulesApiHistory: ModulesApiHistory ) : IncrementalCompilerRunner( workingDir, "caches-js", - cachesVersionManagers, reporter, buildHistoryFile = buildHistoryFile ) { diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt index a87fc9a6ba7..171d8cf0b4a 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt @@ -65,12 +65,10 @@ fun makeIncrementally( val buildHistoryFile = File(cachesDir, "build-history.bin") withIC { - val versions = commonCacheVersionsManagers(cachesDir, true) + standaloneCacheVersionManager(cachesDir, true) - val compiler = IncrementalJvmCompilerRunner( cachesDir, sourceRoots.map { JvmSourceRoot(it, null) }.toSet(), - versions, reporter, + reporter, // Use precise setting in case of non-Gradle build usePreciseJavaTracking = true, localStateDirs = emptyList(), @@ -102,7 +100,6 @@ inline fun withIC(enabled: Boolean = true, fn: ()->R): R { class IncrementalJvmCompilerRunner( workingDir: File, private val javaSourceRoots: Set, - cachesVersionManagers: List, reporter: ICReporter, private val usePreciseJavaTracking: Boolean, buildHistoryFile: File, @@ -112,7 +109,6 @@ class IncrementalJvmCompilerRunner( ) : IncrementalCompilerRunner( workingDir, "caches-jvm", - cachesVersionManagers, reporter, localStateDirs = localStateDirs, buildHistoryFile = buildHistoryFile diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/cacheVersions.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/cacheVersions.kt deleted file mode 100644 index f96dd496978..00000000000 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/cacheVersions.kt +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.incremental - -import org.jetbrains.kotlin.incremental.storage.version.CacheVersionManager -import org.jetbrains.kotlin.incremental.storage.version.localCacheVersionManager -import org.jetbrains.kotlin.incremental.storage.version.lookupsCacheVersionManager -import java.io.File - -internal const val STANDALONE_CACHE_VERSION = 2 -internal const val STANDALONE_VERSION_FILE_NAME = "standalone-ic-format-version.txt" - -fun standaloneCacheVersionManager(dataRoot: File, enabled: Boolean): CacheVersionManager = - customCacheVersionManager(STANDALONE_CACHE_VERSION, STANDALONE_VERSION_FILE_NAME, dataRoot, enabled) - -fun customCacheVersionManager(version: Int, fileName: String, dataRoot: File, enabled: Boolean): CacheVersionManager = - CacheVersionManager( - File(dataRoot, fileName), - if (enabled) version else null - ) - -fun commonCacheVersionsManagers(cachesDir: File, enabled: Boolean): List = - listOf( - localCacheVersionManager(cachesDir, enabled), - lookupsCacheVersionManager(cachesDir, enabled) - ) \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/incremental/gradleCacheVersion.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/incremental/gradleCacheVersion.kt deleted file mode 100644 index 327ab5dc79f..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/incremental/gradleCacheVersion.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle.incremental - -import org.jetbrains.kotlin.incremental.customCacheVersionManager -import org.jetbrains.kotlin.incremental.storage.version.CacheVersionManager -import java.io.File - -internal const val GRADLE_CACHE_VERSION = 4 -internal const val GRADLE_CACHE_VERSION_FILE_NAME = "gradle-format-version.txt" - -internal fun gradleCacheVersionManager(dataRoot: File, enabled: Boolean): CacheVersionManager = - customCacheVersionManager( - GRADLE_CACHE_VERSION, - GRADLE_CACHE_VERSION_FILE_NAME, - dataRoot, - enabled - )