From ea9422fedd8cd822ae6c48c32a05b75306bc0c78 Mon Sep 17 00:00:00 2001 From: "Aleksei.Cherepanov" Date: Wed, 24 Nov 2021 17:40:52 +0300 Subject: [PATCH] [CHERRY PICKED FROM IJ] Update Kotlin caches version due to adding LookupSymbolKeyDescriptor versioning Since versioning of LookupSymbolKeyDescriptor was added in 1.5.30: f6b428f2 "KT-34862 use abi snapshot instead of build history files", it is necessary to update version of caches for JPS, as new caches are not compatible with previous. #KT-48399 Fixed GitOrigin-RevId: 59b1071c1a1090f78c51824d45e6c000f4ef2f3f Original commit: https://github.com/JetBrains/intellij-community/commit/658f4aeb603bb224a14a92933ebe519948db7745 --- .../src/org/jetbrains/kotlin/jps/incremental/local.kt | 2 +- .../src/org/jetbrains/kotlin/jps/incremental/lookups.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt index fcf1bd3b012..2cbfa64eaf1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.jps.incremental import java.nio.file.Path -private const val NORMAL_VERSION = 14 +private const val NORMAL_VERSION = 15 private const val NORMAL_VERSION_FILE_NAME = "format-version.txt" fun localCacheVersionManager(dataRoot: Path, isCachesEnabled: Boolean) = CacheVersionManager( diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/lookups.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/lookups.kt index 3d688e51c4a..040770f3059 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/lookups.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/lookups.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.jps.incremental import java.nio.file.Path private const val DATA_CONTAINER_VERSION_FILE_NAME = "data-container-format-version.txt" -private const val DATA_CONTAINER_VERSION = 5 +private const val DATA_CONTAINER_VERSION = 6 fun lookupsCacheVersionManager(dataRoot: Path, isEnabled: Boolean) = CacheVersionManager( dataRoot.resolve(DATA_CONTAINER_VERSION_FILE_NAME),