[Build] Migrate ASM dependency to the version catalog

analysis/analysis-api/build.gradle.kts

@@ -21,7 +21,7 @@ dependencies {
     implementation(project(":analysis:kt-references"))
 
     api(intellijCore())
-    api(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    api(libs.intellij.asm)
     api(libs.guava)
 }
 

build-common/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
 
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
     compileOnly(project(":compiler:build-tools:kotlin-build-statistics"))
 
     testCompileOnly(project(":compiler:cli-common"))

compiler/backend.common.jvm/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 dependencies {
     api(project(":core:compiler.common.jvm"))
     api(project(":compiler:config.jvm"))
-    api(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    api(libs.intellij.asm)
     api(libs.guava)
     compileOnly(intellijCore())
 }

compiler/backend/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
     api(project(":compiler:backend.common.jvm"))
     compileOnly(intellijCore())
     compileOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
     compileOnly(libs.guava)
 }
 

compiler/cli/cli-base/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
     compileOnly(toolsJarApi())
     compileOnly(intellijCore())
     compileOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
     runtimeOnly(libs.kotlinx.coroutines.core)
 }
 

compiler/cli/cli-common/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
     compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
     compileOnly(intellijCore())
     compileOnly(libs.guava)
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 }
 
 sourceSets {

compiler/config.jvm/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 dependencies {
     api(project(":compiler:config"))
     api(project(":core:compiler.common.jvm"))
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 }
 
 sourceSets {

compiler/fir/fir2ir/jvm-backend/build.gradle.kts

@@ -21,7 +21,7 @@ dependencies {
     compileOnly(project(":compiler:ir.actualization"))
 
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 }
 
 optInToUnsafeDuringIrConstructionAPI()

compiler/fir/java/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     implementation(project(":core:deserialization.common.jvm"))
 
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 }
 
 

compiler/frontend.common.jvm/build.gradle.kts

@@ -9,7 +9,7 @@ dependencies {
     api(project(":core:deserialization.common.jvm"))
     implementation(project(":core:compiler.common.jvm"))
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 
     implementation(project(":core:descriptors.jvm"))
     api(project(":compiler:psi"))

compiler/frontend.java/build.gradle.kts

@@ -14,7 +14,7 @@ dependencies {
     api(project(":compiler:frontend.common.jvm"))
 
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
     compileOnly(libs.guava)
 }
 

compiler/ir/backend.jvm/build.gradle.kts

@@ -9,7 +9,7 @@ dependencies {
     api(project(":compiler:ir.backend.common"))
     api(project(":compiler:backend.common.jvm"))
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 }
 
 optInToUnsafeDuringIrConstructionAPI()

compiler/light-classes/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     api(project(":compiler:frontend"))
     api(project(":compiler:frontend.java"))
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
     compileOnly(libs.guava)
     compileOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
 }

compiler/preloader/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 }
 
 sourceSets {

compiler/resolution.common.jvm/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
     implementation(commonDependency("io.javaslang","javaslang"))
     compileOnly(intellijCore())
     compileOnly(libs.kotlinx.coroutines.core.jvm)
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
     compileOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
     compileOnly(libs.guava)
 }

compiler/tests-common/build.gradle.kts

@@ -77,7 +77,7 @@ dependencies {
     testApi(intellijJavaRt()) // for FileComparisonFailure
 
     testImplementation(libs.guava)
-    testImplementation(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    testImplementation(libs.intellij.asm)
     testImplementation(commonDependency("org.jetbrains.intellij.deps:log4j"))
     testImplementation(intellijJDom())
 

compiler/tests-compiler-utils/build.gradle.kts

@@ -31,7 +31,7 @@ dependencies {
 
     testApi(libs.guava)
     testApi(commonDependency("org.jetbrains.intellij.deps:trove4j"))
-    testApi(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    testApi(libs.intellij.asm)
     testApi(commonDependency("org.jetbrains.intellij.deps:log4j"))
     testApi(intellijJDom())
 }

compiler/util/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
 
     compileOnly(intellijCore())
     compileOnly(commonDependency("org.jetbrains.intellij.deps:log4j"))
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
     compileOnly(jpsModel()) { isTransitive = false }
     compileOnly(jpsModelImpl()) { isTransitive = false }
 

gradle/libs.versions.toml

@@ -30,15 +30,16 @@ opentest4j = "1.3.0" # should be consistent with the version brought by junit-pl
 android-gradle-plugin = "7.3.1"
 android-tools = "30.3.1"
 gradle-node = "7.0.1"
-commons-text="1.10.0"
-lincheck="2.28.1"
+commons-text = "1.10.0"
+lincheck = "2.28.1"
 xerces = "2.12.2"
 # Compose versions used for Compose compiler plugin tests
 compose-stable = "1.7.0-alpha08"
 compose-snapshot-id = "12192498"
 compose-snapshot-version = "1.8.0-SNAPSHOT"
 ant = "1.10.14"
 kotlin-for-gradle-plugins-compilation = "2.0.20-RC"
+intellij-asm = "9.0"
 # Wasm specific
 wasmedge = "0.14.0"
 
@@ -97,6 +98,7 @@ android-tools-common = { module = "com.android.tools:common", version.ref = "and
 xerces = { module = "xerces:xercesImpl", version.ref = "xerces" }
 
 ant = { module = "org.apache.ant:ant", version.ref = "ant" }
+intellij-asm = { module = "org.jetbrains.intellij.deps:asm-all", version.ref = "intellij-asm" }
 
 [plugins]
 jetbrains-ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "jetbrains-ideaExt" }

gradle/versions.properties

@@ -3,7 +3,6 @@ versions.intellijSdk=233.13135.103
 # versions.* should match library versions used in IDEA from versions.intellijSdk
 
 versions.annotations=21.0.0
-versions.asm-all=9.0
 versions.commons-lang=2.4
 versions.aalto-xml=1.3.0
 versions.gradle-api=4.5.1

jps/jps-platform-api-signatures/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 
 dependencies {
     implementation(kotlinStdlib())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
     compileOnly(intellijPlatformUtil())
 }
 

libraries/kotlinx-metadata/jvm/build.gradle.kts

@@ -30,7 +30,7 @@ dependencies {
     embedded(protobufLite())
     testImplementation(kotlinTest("junit"))
     testImplementation(libs.junit4)
-    testImplementation(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    testImplementation(libs.intellij.asm)
     testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
 }
 

libraries/tools/abi-comparator/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    implementation(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    implementation(libs.intellij.asm)
     implementation(commonDependency("org.apache.commons:commons-text"))
 
     implementation(project(":tools:kotlinp-jvm"))

libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts

@@ -113,7 +113,7 @@ dependencies {
 
     testRuntimeOnly(project(":compiler:tests-mutes"))
 
-    testCompileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    testCompileOnly(libs.intellij.asm)
 }
 
 val konanDataDir: String = System.getProperty("konanDataDirForIntegrationTests")

libraries/tools/kotlin-gradle-plugin/build.gradle.kts

@@ -134,7 +134,7 @@ dependencies {
     commonCompileOnly(project(":kotlin-tooling-metadata"))
     commonCompileOnly(project(":compiler:build-tools:kotlin-build-statistics"))
     commonCompileOnly(project(":native:swift:swift-export-standalone"))
-    commonCompileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) { isTransitive = false }
+    commonCompileOnly(libs.intellij.asm) { isTransitive = false }
 
     commonImplementation(project(":kotlin-gradle-plugin-idea"))
     commonImplementation(project(":kotlin-gradle-plugin-idea-proto"))
@@ -157,7 +157,7 @@ dependencies {
 
     embedded(project(":kotlin-gradle-build-metrics"))
     embedded(project(":kotlin-gradle-statistics"))
-    embedded(commonDependency("org.jetbrains.intellij.deps:asm-all")) { isTransitive = false }
+    embedded(libs.intellij.asm) { isTransitive = false }
     embedded(commonDependency("com.google.code.gson:gson")) { isTransitive = false }
     embedded(libs.guava) { isTransitive = false }
     embedded(commonDependency("org.jetbrains.teamcity:serviceMessages")) { isTransitive = false }

plugins/android-extensions/android-extensions-compiler/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":kotlin-android-extensions-runtime"))
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 
     testApi(project(":compiler:util"))
     testApi(project(":compiler:backend"))

plugins/atomicfu/atomicfu-compiler/build.gradle.kts

@@ -58,7 +58,7 @@ repositories {
 
 dependencies {
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 
     compileOnly(project(":compiler:plugin-api"))
     compileOnly(project(":compiler:cli-common"))

plugins/fir-plugin-prototype/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
     compileOnly(project(":compiler:fir:entrypoint"))
     compileOnly(project(":compiler:plugin-api"))
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 
     testApi(platform(libs.junit.bom))
     testImplementation(libs.junit.jupiter.api)

plugins/jvm-abi-gen/build.gradle.kts

@@ -38,7 +38,7 @@ dependencies {
     embedded(project(":kotlin-metadata-jvm"))
 
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 
     testImplementation(libs.junit4)
     testImplementation(projectTests(":compiler:tests-common"))

plugins/kapt3/kapt3-compiler/build.gradle.kts

@@ -19,7 +19,7 @@ dependencies {
     compileOnly(project(":kotlin-annotation-processing-runtime"))
     compileOnly(intellijCore())
     compileOnly(toolsJarApi())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 
     testImplementation(intellijCore())
     testRuntimeOnly(intellijResources()) { isTransitive = false }

plugins/noarg/noarg.backend/build.gradle.kts

@@ -9,7 +9,7 @@ dependencies {
     compileOnly(project(":compiler:backend"))
     compileOnly(project(":compiler:ir.backend.common"))
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
     implementation(kotlinStdlib())
 }
 

plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
     compileOnly(project(":compiler:ir.tree"))
     compileOnly(project(":compiler:fir:tree"))
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 }
 
 optInToUnsafeDuringIrConstructionAPI()

plugins/scripting/scripting-compiler-impl/build.gradle.kts

@@ -19,7 +19,7 @@ dependencies {
     api(kotlinStdlib())
     compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 
     // FIXME: drop after removing references to LocalFileSystem they don't exist in intellij-core
     compileOnly(intellijAnalysis())

prepare/compiler/build.gradle.kts

@@ -233,7 +233,7 @@ dependencies {
     fatJarContents(commonDependency("org.jetbrains.intellij.deps.jna:jna-platform")) { isTransitive = false }
     fatJarContents(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
     fatJarContents(commonDependency("org.lz4:lz4-java")) { isTransitive = false }
-    fatJarContents(commonDependency("org.jetbrains.intellij.deps:asm-all")) { isTransitive = false }
+    fatJarContents(libs.intellij.asm) { isTransitive = false }
     fatJarContents(libs.guava) { isTransitive = false }
     //Gson is needed for kotlin-build-statistics. Build statistics could be enabled for JPS and Gradle builds. Gson will come from inteliij or KGP.
     proguardLibraries(commonDependency("com.google.code.gson:gson")) { isTransitive = false}

test-instrumenter/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 dependencies {
     api(kotlinStdlib())
     compileOnly(intellijCore())
-    compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
+    compileOnly(libs.intellij.asm)
 }
 
 sourceSets {