Update to kotlinx-metadata-jvm 0.6.2

Migrate to the new API in kotlin-reflect build script, remove obsolete
workarounds.
This commit is contained in:
Alexander Udalov
2023-06-23 13:38:12 +02:00
committed by Space Team
parent 5451477eb0
commit ecc1f9fb0b
6 changed files with 41 additions and 47 deletions
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.jvm.abi
import com.intellij.openapi.util.io.FileUtil
import junit.framework.TestCase
import kotlinx.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
import org.jetbrains.kotlin.codegen.CodegenTestUtil
@@ -84,14 +83,6 @@ abstract class BaseJvmAbiTest : TestCase() {
if (InTextDirectivesUtils.findStringWithPrefixes(directives, "// USE_K2") != null) {
useK2 = true
// Force metadata version 1.9 to circumvent the fact that kotlinx-metadata-jvm 0.6.0 has default metadata version 1.8,
// so it can read/write metadata with versions up to and including 1.9, yet K2 has metadata version 2.0+.
// This hack can be removed once jvm-abi-gen depends on kotlinx-metadata-jvm that can read/write metadata version 2.0.
// Without this hack, CompileAgainstJvmAbiTestGenerated.testInlineClassWithPrivateConstructorK2 currently fails.
if (KotlinClassMetadata.COMPATIBLE_METADATA_VERSION.take(2) == listOf(1, 8)) {
metadataVersion = "1.9"
}
}
}
val exitCode = compiler.exec(messageCollector, Services.EMPTY, args)