From 987946f4257d41db7a25bac2a114b1d44c6a5728 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 8 Sep 2015 20:21:19 +0300 Subject: [PATCH] Improve ABI version from one number to "major.minor.patch" Original commit: 6cecc66d1054df2581a33c22c2824d3a5cb92550 --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 58b8b0d2dc0..c0b865d962a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -68,7 +68,11 @@ class CacheFormatVersion(targetDataRoot: File) { companion object { // Change this when incremental cache format changes private val INCREMENTAL_CACHE_OWN_VERSION = 4 - private val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION + + private val CACHE_FORMAT_VERSION = + INCREMENTAL_CACHE_OWN_VERSION * 1000000 + + JvmAbi.VERSION.major * 1000 + + JvmAbi.VERSION.minor private val NON_INCREMENTAL_MODE_PSEUDO_VERSION = Int.MAX_VALUE