From 5c6e8fa05d2cbdd84b1ca9cf20ff5239408f6650 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 15 Feb 2021 17:04:34 +0100 Subject: [PATCH] Remove JvmBytecodeBinaryVersion from the compiler code Move it to build-common where it's still used in incremental compilation caches, and simplify a bit. In the future, it'll make sense to remove it completely and to avoid writing it to caches. In this commit, I don't do that to prevent the IC cache version to be updated, causing rebuilds for all JPS projects. #KT-41758 (cherry picked from commit f63ffc51ae6ce0a3ae5b278f86f49e2e5efbfc33) Original commit: 15b3f54e666c91aa19255d4887d8916a711b79c4 --- .../org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt | 4 ++-- .../jetbrains/kotlin/jps/incremental/CacheVersionManager.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 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 997617cc0ec..0e309c86f6d 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.metadata.jvm.deserialization.JvmBytecodeBinaryVersion +import org.jetbrains.kotlin.build.JvmBytecodeBinaryVersion import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion import org.junit.Assert.assertEquals import org.junit.Test @@ -54,4 +54,4 @@ class CacheVersionTest { ).toString() ) } -} \ No newline at end of file +} 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 a36116dbe3e..8318ce3f53d 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.metadata.jvm.deserialization.JvmBytecodeBinaryVersion +import org.jetbrains.kotlin.build.JvmBytecodeBinaryVersion import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion import java.io.File import java.io.IOException @@ -79,4 +79,4 @@ data class CacheVersion(val intValue: Int) { ) override fun toString(): String = "CacheVersion(caches: $own, bytecode: $bytecode, metadata: $metadata)" -} \ No newline at end of file +}