From 486b6cd2e0a3d56f07dc91b52bb6850c2affc3ea Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 28 Mar 2016 03:04:46 +0300 Subject: [PATCH] Refactor: move allVersions() to jps-plugin since it is jps specific Original commit: 4c782dbfcc24072fae60a745d41fdd6989da6c63 --- .../jps/incremental/CacheVersionProvider.kt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt index 81652efe9aa..31696d0f7f0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt @@ -19,7 +19,10 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.kotlin.incremental.* +import org.jetbrains.kotlin.incremental.CacheVersion +import org.jetbrains.kotlin.incremental.dataContainerCacheVersion +import org.jetbrains.kotlin.incremental.experimentalCacheVersion +import org.jetbrains.kotlin.incremental.normalCacheVersion import java.io.File @@ -33,5 +36,15 @@ class CacheVersionProvider(private val paths: BuildDataPaths) { fun dataContainerVersion(): CacheVersion = dataContainerCacheVersion(KotlinDataContainerTarget.dataRoot) - fun allVersions(targets: Iterable): Iterable = allCachesVersions(KotlinDataContainerTarget.dataRoot, targets.map { it.dataRoot } ) + fun allVersions(targets: Iterable): Iterable { + val versions = arrayListOf() + versions.add(dataContainerCacheVersion(KotlinDataContainerTarget.dataRoot)) + + for (dataRoot in targets.map { it.dataRoot }) { + versions.add(normalCacheVersion(dataRoot)) + versions.add(experimentalCacheVersion(dataRoot)) + } + + return versions + } } \ No newline at end of file