Skip to content

Commit 0946452

Browse files
ShikaSDkotlin-safe-merge[bot]
authored andcommitted
Bump version of the ASM dependency
Allow Compose mapping analysis to read files compiled for Java 25+. Fixes: CMP-9459 Test: ComposeIT
1 parent 655fb78 commit 0946452

4 files changed

Lines changed: 20 additions & 3 deletions

File tree

gradle/verification-metadata.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5449,6 +5449,12 @@
54495449
<sha256 value="adf46d5e34940bdf148ecdd26a9ee8eea94496a72034ff7141066b3eea5c4e9d" origin="Generated by Gradle"/>
54505450
</artifact>
54515451
</component>
5452+
<component group="org.ow2.asm" name="asm" version="9.9.1">
5453+
<artifact name="asm-9.9.1.jar">
5454+
<md5 value="1888ad1f49038441bb2d12aa6dffe396" origin="Generated by Gradle"/>
5455+
<sha256 value="6f3828a215c920059a5efa2fb55c233d6c54ec5cadca99ce1b1bdd10077c7ddd" origin="Generated by Gradle"/>
5456+
</artifact>
5457+
</component>
54525458
<component group="org.ow2.asm" name="asm-analysis" version="9.6">
54535459
<artifact name="asm-analysis-9.6.jar">
54545460
<md5 value="31c84ef7cc893fb278952ae2d6a2674f" origin="Generated by Gradle"/>
@@ -5497,6 +5503,12 @@
54975503
<sha256 value="62f4b3bc436045c1acb5c3ba2d8ec556ec3369093d7f5d06c747eb04b56d52b1" origin="Generated by Gradle"/>
54985504
</artifact>
54995505
</component>
5506+
<component group="org.ow2.asm" name="asm-tree" version="9.9.1">
5507+
<artifact name="asm-tree-9.9.1.jar">
5508+
<md5 value="7eb17cd0d09b03fbe473e51edfc6e4d2" origin="Generated by Gradle"/>
5509+
<sha256 value="0f3555096b720b820bbacab0b515589bee0200bee099bda14c561738ae837ba1" origin="Generated by Gradle"/>
5510+
</artifact>
5511+
</component>
55005512
<component group="org.ow2.asm" name="asm-util" version="9.6">
55015513
<artifact name="asm-util-9.6.jar">
55025514
<md5 value="bd3bc1c176a787373e9a031073c9574b" origin="Generated by Gradle"/>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ComposeIT.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.gradle
77

88
import com.android.build.api.variant.ApplicationAndroidComponentsExtension
99
import org.gradle.api.logging.LogLevel
10-
import org.gradle.api.logging.configuration.WarningMode
1110
import org.gradle.kotlin.dsl.getByType
1211
import org.gradle.util.GradleVersion
1312
import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
@@ -668,6 +667,12 @@ class ComposeIT : KGPBaseTest() {
668667
it.shrinkResources = true
669668
}
670669
}
670+
// Known dependency that is compiled with JDK 25
671+
// Tests for CMP-9459
672+
dependencies.add(
673+
"implementation",
674+
"org.bouncycastle:bcprov-jdk18on:1.83"
675+
)
671676
}
672677

673678
build("assembleRelease") {

plugins/compose/group-mapping/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ configureKotlinCompileTasksGradleCompatibility()
77
dependencies {
88
val coreDepsVersion = libs.versions.kotlin.`for`.gradle.plugins.compilation.get()
99
implementation("org.jetbrains.kotlin:kotlin-stdlib:$coreDepsVersion")
10-
implementation("org.ow2.asm:asm-tree:9.7")
10+
implementation("org.ow2.asm:asm-tree:9.9.1")
1111
}
1212

1313
base {

repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/compose-group-mapping/compose-group-mapping.pom

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>org.ow2.asm</groupId>
4040
<artifactId>asm-tree</artifactId>
41-
<version>9.7</version>
41+
<version>9.9.1</version>
4242
<scope>runtime</scope>
4343
</dependency>
4444
</dependencies>

0 commit comments

Comments
 (0)