azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move version constants to corresponding BinaryVersion subclasses

Browse Source 
Original commit: 04d335db15
This commit is contained in:
Alexander Udalov
2015-12-28 16:23:14 +03:00
parent f7934e8943
commit 00075fc837
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt
+2 -2
View File
@@ -22,7 +22,7 @@ import org.jetbrains.jps.builders.storage.BuildDataPaths
import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.ModuleBuildTarget
import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.IncrementalCompilation
import org.jetbrains.kotlin.jps.incremental.CacheVersion.Action import org.jetbrains.kotlin.jps.incremental.CacheVersion.Action
import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmBytecodeBinaryVersion
import java.io.File import java.io.File
private val NORMAL_VERSION = 8 private val NORMAL_VERSION = 8
@@ -47,7 +47,7 @@ class CacheVersion(
get() = versionFile.readText().toInt() get() = versionFile.readText().toInt()
private val expectedVersion: Int private val expectedVersion: Int
get() = ownVersion * 1000000 + JvmAbi.VERSION.major * 1000 + JvmAbi.VERSION.minor get() = ownVersion * 1000000 + JvmBytecodeBinaryVersion.INSTANCE.major * 1000 + JvmBytecodeBinaryVersion.INSTANCE.minor
fun checkVersion(): Action = fun checkVersion(): Action =
when (versionFile.exists() to isEnabled) { when (versionFile.exists() to isEnabled) {