update ASM from 9.0 to 9.6.1 to use a recent version as IJ JPS

#KT-74276
JetBrains · Jan 9, 2025 · 84caa8a · 84caa8a
1 parent 4112767
commit 84caa8a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemappingClassBuilder.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemappingClassBuilder.java
@@ -121,7 +121,7 @@ public MethodVisitor newMethod(
     @Override
     @NotNull
     public AnnotationVisitor newAnnotation(@NotNull String desc, boolean visible) {
-        return new AnnotationRemapper(builder.newAnnotation(remapper.mapDesc(desc), visible), remapper);
+        return new AnnotationRemapper(null, builder.newAnnotation(remapper.mapDesc(desc), visible), remapper);
     }
 
     @Override

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -42,7 +42,7 @@ compose-stable = "1.7.0-alpha08" # Used for Compose compiler plugin tests
 androidx-collections = "1.5.0-alpha02" # Used for Compose compiler plugin tests
 ant = "1.10.14"
 kotlin-for-gradle-plugins-compilation = "2.0.20-RC"
-intellij-asm = "9.0"
+intellij-asm = "9.6.1"
 diff-utils = "4.12"
 opentelemetry-api = "1.41.0"
 # Wasm specific

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -3806,18 +3806,18 @@
             <sha256 value="aa118ff9eed82cb1cc93f6e489bfe19ba795fd9a18892873d2d4beded4636969" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.intellij.deps" name="asm-all" version="9.0">
-         <artifact name="asm-all-9.0.jar">
-            <md5 value="59d1070bc2cab3e2ec94e14bb23106be" origin="Generated by Gradle"/>
-            <sha256 value="7db70502eacadde838d50e1e536c3ddc4b8fbde7445ae26a0bc6b918a0db0570" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.jetbrains.intellij.deps" name="asm-all" version="9.5.3">
          <artifact name="asm-all-9.5.3.jar">
             <md5 value="56f2c2ef810911f5edf68c7b5ccfd067" origin="Generated by Gradle"/>
             <sha256 value="ee2763fcf9979a20790cb353a8cf7ad6a5dbacbc35a367ef68796734fa1b963f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.intellij.deps" name="asm-all" version="9.6.1">
+         <artifact name="asm-all-9.6.1.jar">
+            <md5 value="56b3b598714774359da5d6d9a290d9ef" origin="Generated by Gradle"/>
+            <sha256 value="a72e84efb1406a7ab326e0b28c4376e9e1ebfc08c09f23edff5e6e7249588df7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.intellij.deps" name="log4j" version="1.2.17.2">
          <artifact name="log4j-1.2.17.2.jar">
             <md5 value="581b8bb9bc302efee23c375ab37de2b9" origin="Generated by Gradle"/>

diff --git a/libraries/tools/kotlinp/jvm/build.gradle.kts b/libraries/tools/kotlinp/jvm/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     id("jps-compatible")
 }
 
-val kotlinpAsmVersion = "9.0"
+val kotlinpAsmVersion = "9.6.1"
 val shadows by configurations.creating
 
 dependencies {