From 4c782dbfcc24072fae60a745d41fdd6989da6c63 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Mon, 28 Mar 2016 03:04:46 +0300
Subject: [PATCH] Refactor: move allVersions() to jps-plugin since it is jps
 specific

---
 .../kotlin/incremental/CacheVersion.kt          | 12 ------------
 .../jps/incremental/CacheVersionProvider.kt     | 17 +++++++++++++++--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt b/build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt
index 35f374a7300..f9edab246e9 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt
@@ -112,15 +112,3 @@ fun dataContainerCacheVersion(dataRoot: File): CacheVersion =
                      whenTurnedOn = CacheVersion.Action.REBUILD_ALL_KOTLIN,
                      whenTurnedOff = CacheVersion.Action.CLEAN_DATA_CONTAINER,
                      isEnabled = { IncrementalCompilation.isExperimental() })
-
-fun allCachesVersions(containerDataRoot: File, dataRoots: Iterable<File>): Iterable<CacheVersion> {
-    val versions = arrayListOf<CacheVersion>()
-    versions.add(dataContainerCacheVersion(containerDataRoot))
-
-    for (dataRoot in dataRoots) {
-        versions.add(normalCacheVersion(dataRoot))
-        versions.add(experimentalCacheVersion(dataRoot))
-    }
-
-    return versions
-}
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt
index 81652efe9aa..31696d0f7f0 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt
+++ b/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<ModuleBuildTarget>): Iterable<CacheVersion> = allCachesVersions(KotlinDataContainerTarget.dataRoot, targets.map { it.dataRoot } )
+    fun allVersions(targets: Iterable<ModuleBuildTarget>): Iterable<CacheVersion> {
+        val versions = arrayListOf<CacheVersion>()
+        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