Unify Gradle and Kotlin daemon cache version checking

compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/IncrementalCompilationServicesFacade.kt

@@ -34,6 +34,12 @@ interface IncrementalCompilationServicesFacade : Remote {
     @Throws(RemoteException::class)
     fun workingDir(): File
 
+    @Throws(RemoteException::class)
+    fun customCacheVersionFileName(): String
+
+    @Throws(RemoteException::class)
+    fun customCacheVersion(): Int
+
     // ICReporter
 
     @Throws(RemoteException::class)

compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt

@@ -362,7 +362,8 @@ class CompileServiceImpl(
             val changesRegistry = RemoteChangesRegostry(servicesFacade)
 
             val workingDir = servicesFacade.workingDir()
-            val versions = commonCacheVersions(workingDir) + standaloneCacheVersion(workingDir, forceEnable = true)
+            val versions = commonCacheVersions(workingDir) +
+                           customCacheVersion(servicesFacade.customCacheVersion(), servicesFacade.customCacheVersionFileName(), workingDir, forceEnable = true)
 
             try {
                 printStream.print(renderer.renderPreamble())