Skip to content

Commit 1a45888

Browse files
bnormSpace Team
authored andcommitted
[Build] Use bootstrap version of kotlin-metadata-jvm
Without this update, the build of kotlin-reflect fails because kotlinx-metadata-jvm is unable to read Kotlin 2.2 metadata. ^KT-74254
1 parent 690e0ac commit 1a45888

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

gradle/verification-metadata.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4730,6 +4730,12 @@
47304730
<sha256 value="b68f39cd9ad7b46de0a0e77e7f5908d4e7661f3d0c85d2d9171543fcd5b156fb" origin="Generated by Gradle"/>
47314731
</artifact>
47324732
</component>
4733+
<component group="org.jetbrains.kotlinx" name="kotlinx-metadata-jvm" version="0.6.0">
4734+
<artifact name="kotlinx-metadata-jvm-0.6.0.jar">
4735+
<md5 value="e0c79c2b06d7e2a00ca76bd13ebd6e38" origin="Generated by Gradle"/>
4736+
<sha256 value="a20b73b2b30ba6e08a5ffc990b3db9abd0649e42c79ff5da38d22040a3284068" origin="Generated by Gradle"/>
4737+
</artifact>
4738+
</component>
47334739
<component group="org.jetbrains.kotlinx" name="kotlinx-metadata-jvm" version="0.6.2">
47344740
<artifact name="kotlinx-metadata-jvm-0.6.2.jar">
47354741
<md5 value="54753fc5e62ddb7831d3539d2cf7728f" origin="Generated by Gradle"/>

libraries/reflect/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22
import com.github.jengelman.gradle.plugins.shadow.transformers.CacheableTransformer
33
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
44
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
5-
import kotlinx.metadata.jvm.KotlinModuleMetadata
6-
import kotlinx.metadata.jvm.UnstableMetadataApi
5+
import kotlin.metadata.jvm.KotlinModuleMetadata
6+
import kotlin.metadata.jvm.UnstableMetadataApi
77
import org.apache.tools.zip.ZipEntry
88
import org.apache.tools.zip.ZipOutputStream
99
import org.gradle.kotlin.dsl.support.serviceOf
@@ -13,7 +13,7 @@ description = "Kotlin Full Reflection Library"
1313

1414
buildscript {
1515
dependencies {
16-
classpath(libs.kotlinx.metadataJvm)
16+
classpath("org.jetbrains.kotlin:kotlin-metadata-jvm:${project.bootstrapKotlinVersion}")
1717
}
1818
}
1919

repo/gradle-build-conventions/asm-deprecating-transformer/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ kotlin {
2626
dependencies {
2727
compileOnly(kotlin("stdlib", embeddedKotlinVersion))
2828
implementation(libs.intellij.asm)
29-
implementation(libs.kotlinx.metadataJvm)
29+
implementation("org.jetbrains.kotlin:kotlin-metadata-jvm:${project.bootstrapKotlinVersion}")
3030
implementation(libs.diff.utils)
3131
compileOnly(libs.shadow.gradlePlugin)
3232
}

repo/gradle-build-conventions/asm-deprecating-transformer/src/main/kotlin/org/jetbrains/kotlin/build/asm/DeprecatingClassTransformer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
package org.jetbrains.kotlin.build.asm
77

8-
import kotlinx.metadata.hasAnnotations
9-
import kotlinx.metadata.jvm.KotlinClassMetadata
8+
import kotlin.metadata.hasAnnotations
9+
import kotlin.metadata.jvm.KotlinClassMetadata
1010
import org.jetbrains.org.objectweb.asm.AnnotationVisitor
1111
import org.jetbrains.org.objectweb.asm.ClassVisitor
1212
import org.jetbrains.org.objectweb.asm.ClassWriter

repo/gradle-build-conventions/buildsrc-compat/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ dependencies {
112112
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
113113
implementation("org.jetbrains.kotlin:kotlin-stdlib:${project.bootstrapKotlinVersion}")
114114
implementation("org.jetbrains.kotlin:kotlin-reflect:${project.bootstrapKotlinVersion}")
115+
implementation("org.jetbrains.kotlin:kotlin-metadata-jvm:${project.bootstrapKotlinVersion}")
115116
implementation(libs.gson)
116-
implementation(libs.kotlinx.metadataJvm)
117117
implementation(project(":d8-configuration"))
118118
}
119119

repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/KotlinModuleMetadataVersionBasedSkippingTransformer.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
77
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
8-
import kotlinx.metadata.jvm.JvmMetadataVersion
9-
import kotlinx.metadata.jvm.KotlinModuleMetadata
10-
import kotlinx.metadata.jvm.UnstableMetadataApi
8+
import kotlin.metadata.jvm.JvmMetadataVersion
9+
import kotlin.metadata.jvm.KotlinModuleMetadata
10+
import kotlin.metadata.jvm.UnstableMetadataApi
1111
import org.apache.tools.zip.ZipEntry
1212
import org.apache.tools.zip.ZipOutputStream
1313
import org.gradle.api.file.FileTreeElement

0 commit comments

Comments
 (0)