From 46196dc1a3a9edfd3144572cae68653ecc8fdcdf Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 5 Mar 2021 18:37:00 +0100 Subject: [PATCH] Restore writing bytecode version to metadata for LV < 1.5 #KT-45323 Fixed (cherry picked from commit 9970851684ab772275bd44a12507da772d395f4e) Original commit: d8b85debe6afe3af52a234717934aad5289d2b71 --- .../org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt | 2 +- .../org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt index 0e309c86f6d..30a361cae7b 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.jps.incremental -import org.jetbrains.kotlin.build.JvmBytecodeBinaryVersion +import org.jetbrains.kotlin.load.kotlin.JvmBytecodeBinaryVersion import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion import org.junit.Assert.assertEquals import org.junit.Test diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt index 8318ce3f53d..df3cddd57e4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.build.JvmBytecodeBinaryVersion +import org.jetbrains.kotlin.load.kotlin.JvmBytecodeBinaryVersion import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion import java.io.File import java.io.IOException