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

Use JvmMetadataVersion where appropriate instead of bytecode version

Browse Source 
Original commit: b587d3a78d
This commit is contained in:
Alexander Udalov
2016-01-13 21:24:20 +03:00
parent a230c85fe2
commit 494ceae690
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt
+8 -1
View File
@@ -23,6 +23,7 @@ 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.JvmBytecodeBinaryVersion import org.jetbrains.kotlin.load.java.JvmBytecodeBinaryVersion
import org.jetbrains.kotlin.load.kotlin.JvmMetadataVersion
import java.io.File import java.io.File
private val NORMAL_VERSION = 8 private val NORMAL_VERSION = 8
@@ -47,7 +48,13 @@ class CacheVersion(
get() = versionFile.readText().toInt() get() = versionFile.readText().toInt()
private val expectedVersion: Int private val expectedVersion: Int
get() = ownVersion * 1000000 + JvmBytecodeBinaryVersion.INSTANCE.major * 1000 + JvmBytecodeBinaryVersion.INSTANCE.minor get() {
val metadata = JvmMetadataVersion.INSTANCE
val bytecode = JvmBytecodeBinaryVersion.INSTANCE
return ownVersion * 1000000 +
bytecode.major * 10000 + bytecode.minor * 100 +
metadata.major * 1000 + metadata.minor
}
fun checkVersion(): Action = fun checkVersion(): Action =
when (versionFile.exists() to isEnabled) { when (versionFile.exists() to isEnabled) {