diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index ab31f66d926..f81ca1c6b1d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -122,7 +122,7 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib:${project.bootstrapKotlinVersion}") implementation("org.jetbrains.kotlin:kotlin-reflect:${project.bootstrapKotlinVersion}") implementation("com.google.code.gson:gson:2.8.9") // Workaround for Gradle dependency resolution error - implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.0") + implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2") } samWithReceiver { @@ -142,4 +142,4 @@ tasks.withType().configureEach { allprojects { tasks.register("checkBuild") -} \ No newline at end of file +} diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 3d04267e7c3..34243d157bb 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -7859,6 +7859,12 @@ + + + + + + @@ -7975,6 +7981,12 @@ + + + + + + @@ -8775,6 +8787,12 @@ + + + + + + diff --git a/gradle/versions.properties b/gradle/versions.properties index 4d208409389..fa720f6ad3a 100644 --- a/gradle/versions.properties +++ b/gradle/versions.properties @@ -45,7 +45,7 @@ versions.kotlinx-collections-immutable=0.3.1 versions.kotlinx-coroutines-core-jvm=1.5.0 versions.kotlinx-coroutines-core=1.5.0 -versions.kotlinx-metadata-jvm=0.6.0 +versions.kotlinx-metadata-jvm=0.6.2 versions.kotlinx-metadata-klib=0.0.1-dev-10 versions.kotlinx-serialization-json=1.3.3 versions.ktor-network=2.0.2 diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index 97a41112c76..d98ebbc35b8 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -2,7 +2,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.github.jengelman.gradle.plugins.shadow.transformers.CacheableTransformer import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext -import kotlinx.metadata.jvm.KmModuleVisitor import kotlinx.metadata.jvm.KotlinModuleMetadata import org.gradle.kotlin.dsl.support.serviceOf import shadow.org.apache.tools.zip.ZipEntry @@ -12,7 +11,7 @@ description = "Kotlin Full Reflection Library" buildscript { dependencies { - classpath("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.0") + classpath("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2") } } @@ -60,7 +59,7 @@ dependencies { } @CacheableTransformer -class KotlinModuleShadowTransformer(private val logger: Logger, private val useK2: Boolean) : Transformer { +class KotlinModuleShadowTransformer(private val logger: Logger) : Transformer { @Suppress("ArrayInDataClass") private data class Entry(val path: String, val bytes: ByteArray) @@ -75,38 +74,24 @@ class KotlinModuleShadowTransformer(private val logger: Logger, private val useK fun relocate(content: String): String = context.relocators.fold(content) { acc, relocator -> relocator.applyToSourceContent(acc) } - val writer = KotlinModuleMetadata.Writer() logger.info("Transforming ${context.path}") - if (useK2) { - // TODO: remove this branch after migration to version 1.9 - val internalData = org.jetbrains.kotlin.metadata.jvm.deserialization.ModuleMapping.loadModuleMapping( - context.`is`.readBytes(), javaClass.name, skipMetadataVersionCheck = true, isJvmPackageNameSupported = true - ) { - } - val visitor = object : KmModuleVisitor(writer) { - override fun visitPackageParts(fqName: String, fileFacades: List, multiFileClassParts: Map) { - assert(multiFileClassParts.isEmpty()) { multiFileClassParts } // There are no multi-file class parts in core - super.visitPackageParts(relocate(fqName), fileFacades.map(::relocate), multiFileClassParts) - } - } - for ((fqName, parts) in internalData.packageFqName2Parts) { - val (fileFacades, multiFileClassParts) = parts.parts.partition { parts.getMultifileFacadeName(it) == null } - visitor.visitPackageParts(fqName, fileFacades, multiFileClassParts.associateWith { parts.getMultifileFacadeName(it)!! }) - } - visitor.visitEnd() - } else { - val metadata = KotlinModuleMetadata.read(context.`is`.readBytes()) - ?: error("Not a .kotlin_module file: ${context.path}") - // TODO: writer declaration and logger.info call from above should be move here after migration to version 1.9 - metadata.accept(object : KmModuleVisitor(writer) { - override fun visitPackageParts(fqName: String, fileFacades: List, multiFileClassParts: Map) { - assert(multiFileClassParts.isEmpty()) { multiFileClassParts } // There are no multi-file class parts in core - super.visitPackageParts(relocate(fqName), fileFacades.map(::relocate), multiFileClassParts) - } - }) - } + val metadata = KotlinModuleMetadata.read(context.`is`.readBytes()) + ?: error("Not a .kotlin_module file: ${context.path}") + val module = metadata.toKmModule() - data += Entry(context.path, writer.write().bytes) + val packageParts = module.packageParts.toMap() + module.packageParts.clear() + packageParts.map { (fqName, parts) -> + require(parts.multiFileClassParts.isEmpty()) { parts.multiFileClassParts } // There are no multi-file class parts in core + + val fileFacades = parts.fileFacades.toList() + parts.fileFacades.clear() + fileFacades.mapTo(parts.fileFacades) { relocate(it) } + + relocate(fqName) to parts + }.toMap(module.packageParts) + + data += Entry(context.path, KotlinModuleMetadata.write(module).bytes) } override fun hasTransformedResource(): Boolean = data.isNotEmpty() @@ -133,7 +118,7 @@ val reflectShadowJar by task { if (kotlinBuildProperties.relocation) { mergeServiceFiles() - transform(KotlinModuleShadowTransformer(logger, project.kotlinBuildProperties.useFir)) + transform(KotlinModuleShadowTransformer(logger)) relocate("org.jetbrains.kotlin", "kotlin.reflect.jvm.internal.impl") relocate("javax.inject", "kotlin.reflect.jvm.internal.impl.javax.inject") } diff --git a/libraries/tools/binary-compatibility-validator/build.gradle b/libraries/tools/binary-compatibility-validator/build.gradle index ae622ddbcd0..48a07dba984 100644 --- a/libraries/tools/binary-compatibility-validator/build.gradle +++ b/libraries/tools/binary-compatibility-validator/build.gradle @@ -7,7 +7,7 @@ configurations { dependencies { api("org.jetbrains.kotlinx:binary-compatibility-validator:0.13.0") - api("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.0") + api("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2") testApi project(':kotlin-test:kotlin-test-junit') diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt index 2f3b0973c44..89d0dbc8f60 100644 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt +++ b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt @@ -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)