From 494ceae69061becfd298f514596e66e9a84fa25d Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 13 Jan 2016 21:24:20 +0300
Subject: [PATCH] Use JvmMetadataVersion where appropriate instead of bytecode
 version

Original commit: b587d3a78d040e3f49a367bbfb7c996f3efdfa4f
---
 .../org/jetbrains/kotlin/jps/incremental/CacheVersion.kt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt
index cad343f160a..a2abb79eceb 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt
@@ -23,6 +23,7 @@ import org.jetbrains.jps.incremental.ModuleBuildTarget
 import org.jetbrains.kotlin.config.IncrementalCompilation
 import org.jetbrains.kotlin.jps.incremental.CacheVersion.Action
 import org.jetbrains.kotlin.load.java.JvmBytecodeBinaryVersion
+import org.jetbrains.kotlin.load.kotlin.JvmMetadataVersion
 import java.io.File
 
 private val NORMAL_VERSION = 8
@@ -47,7 +48,13 @@ class CacheVersion(
         get() = versionFile.readText().toInt()
 
     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 =
             when (versionFile.exists() to isEnabled) {