From 00075fc8378705eb67f234a404e6911e6152fb76 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 28 Dec 2015 16:23:14 +0300
Subject: [PATCH] Move version constants to corresponding BinaryVersion
 subclasses

Original commit: 04d335db15a20eb69800f6f8260ec01f1491254c
---
 .../src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 493a6e59875..cad343f160a 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
@@ -22,7 +22,7 @@ import org.jetbrains.jps.builders.storage.BuildDataPaths
 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.JvmAbi
+import org.jetbrains.kotlin.load.java.JvmBytecodeBinaryVersion
 import java.io.File
 
 private val NORMAL_VERSION = 8
@@ -47,7 +47,7 @@ class CacheVersion(
         get() = versionFile.readText().toInt()
 
     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 =
             when (versionFile.exists() to isEnabled) {