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 f63ffc51ae)

Original commit: 15b3f54e666c91aa19255d4887d8916a711b79c4
This commit is contained in:
Alexander Udalov
2021-02-15 17:04:34 +01:00
parent 8b38a752d8
commit 5c6e8fa05d
2 changed files with 4 additions and 4 deletions
@@ -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()
)
}
}
}
@@ -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)"
}
}