From 2eeb7e36b928d4874426df2e245831e0ac5db1ff Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 1 Feb 2017 18:30:41 +0300 Subject: [PATCH] Refactoring: extract checking caches versions to function --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index a995806b60c..34cde0dc94c 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -114,6 +114,13 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { if (targets.none { hasKotlin[it] == true }) return + checkCachesVersions(context, chunk) + } + + private fun checkCachesVersions(context: CompileContext, chunk: ModuleChunk) { + val targets = chunk.targets + val dataManager = context.projectDescriptor.dataManager + val cacheVersionsProvider = CacheVersionProvider(dataManager.dataPaths) val allVersions = cacheVersionsProvider.allVersions(targets) val actions = allVersions.map { it.checkVersion() }.toMutableSet() @@ -152,7 +159,6 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { applyActionsOnCacheVersionChange(actions, cacheVersionsProvider, context, dataManager, targets, fsOperations) } - override fun chunkBuildFinished(context: CompileContext?, chunk: ModuleChunk?) { super.chunkBuildFinished(context, chunk)