diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt index 8280c4f2af3..626b78c4458 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt @@ -96,7 +96,7 @@ class KotlinChunk internal constructor(val context: KotlinCompileContext, val ta context.ensureLookupsCacheAttributesSaved() targets.forEach { - it.initialLocalCacheAttributesDiff.saveExpectedIfNeeded() + it.initialLocalCacheAttributesDiff.manager.writeVersion() } val serializedMetaInfo = representativeTarget.buildMetaInfoFactory.serializeToString(compilerArguments) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt index 2abc23db574..1eaa8a049d6 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt @@ -149,7 +149,7 @@ class KotlinCompileContext(val jpsContext: CompileContext) { */ fun ensureLookupsCacheAttributesSaved() { if (lookupAttributesSaved.compareAndSet(false, true)) { - initialLookupsCacheStateDiff.saveExpectedIfNeeded() + initialLookupsCacheStateDiff.manager.writeVersion() } } @@ -207,7 +207,7 @@ class KotlinCompileContext(val jpsContext: CompileContext) { private fun clearLookupCache() { KotlinBuilder.LOG.info("Clearing lookup cache") dataManager.cleanLookupStorage(KotlinBuilder.LOG) - initialLookupsCacheStateDiff.saveExpectedIfNeeded() + initialLookupsCacheStateDiff.manager.writeVersion() } fun cleanupCaches() { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt index e50c18e9471..5e9c6a9f16f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt @@ -47,12 +47,12 @@ class CompositeLookupsCacheAttributesManager( return CompositeLookupsCacheAttributes(version.version, components) } - override fun writeActualVersion(values: CompositeLookupsCacheAttributes?) { + override fun writeVersion(values: CompositeLookupsCacheAttributes?) { if (values == null) { - versionManager.writeActualVersion(null) + versionManager.writeVersion(null) actualComponentsFile.delete() } else { - versionManager.writeActualVersion(CacheVersion(values.version)) + versionManager.writeVersion(CacheVersion(values.version)) actualComponentsFile.parentFile.mkdirs() actualComponentsFile.writeText(values.components.joinToString("\n"))