From 9bfb6e50795b49b3298e840ce3908d3762328bc0 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Fri, 2 Aug 2024 18:21:36 +0200 Subject: [PATCH] [Build] Migrate ASM dependency to the version catalog --- analysis/analysis-api/build.gradle.kts | 2 +- build-common/build.gradle.kts | 2 +- compiler/backend.common.jvm/build.gradle.kts | 2 +- compiler/backend/build.gradle.kts | 2 +- compiler/cli/cli-base/build.gradle.kts | 2 +- compiler/cli/cli-common/build.gradle.kts | 2 +- compiler/config.jvm/build.gradle.kts | 2 +- compiler/fir/fir2ir/jvm-backend/build.gradle.kts | 2 +- compiler/fir/java/build.gradle.kts | 2 +- compiler/frontend.common.jvm/build.gradle.kts | 2 +- compiler/frontend.java/build.gradle.kts | 2 +- compiler/ir/backend.jvm/build.gradle.kts | 2 +- compiler/light-classes/build.gradle.kts | 2 +- compiler/preloader/build.gradle.kts | 2 +- compiler/resolution.common.jvm/build.gradle.kts | 2 +- compiler/tests-common/build.gradle.kts | 2 +- compiler/tests-compiler-utils/build.gradle.kts | 2 +- compiler/util/build.gradle.kts | 2 +- gradle/libs.versions.toml | 6 ++++-- gradle/versions.properties | 1 - jps/jps-platform-api-signatures/build.gradle.kts | 2 +- libraries/kotlinx-metadata/jvm/build.gradle.kts | 2 +- libraries/tools/abi-comparator/build.gradle.kts | 2 +- .../kotlin-gradle-plugin-integration-tests/build.gradle.kts | 2 +- libraries/tools/kotlin-gradle-plugin/build.gradle.kts | 4 ++-- .../android-extensions-compiler/build.gradle.kts | 2 +- plugins/atomicfu/atomicfu-compiler/build.gradle.kts | 2 +- plugins/fir-plugin-prototype/build.gradle.kts | 2 +- plugins/jvm-abi-gen/build.gradle.kts | 2 +- plugins/kapt3/kapt3-compiler/build.gradle.kts | 2 +- plugins/noarg/noarg.backend/build.gradle.kts | 2 +- .../parcelize-compiler/parcelize.backend/build.gradle.kts | 2 +- plugins/scripting/scripting-compiler-impl/build.gradle.kts | 2 +- prepare/compiler/build.gradle.kts | 2 +- test-instrumenter/build.gradle.kts | 2 +- 35 files changed, 38 insertions(+), 37 deletions(-) diff --git a/analysis/analysis-api/build.gradle.kts b/analysis/analysis-api/build.gradle.kts index b936e32f2ac94..291a059ef594e 100644 --- a/analysis/analysis-api/build.gradle.kts +++ b/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) } diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index 7e657dcb6e879..6d0ea1ee5c55a 100644 --- a/build-common/build.gradle.kts +++ b/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")) diff --git a/compiler/backend.common.jvm/build.gradle.kts b/compiler/backend.common.jvm/build.gradle.kts index 55c03f29fbd33..c8ae7c82c0ff2 100644 --- a/compiler/backend.common.jvm/build.gradle.kts +++ b/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()) } diff --git a/compiler/backend/build.gradle.kts b/compiler/backend/build.gradle.kts index 88a828c49211b..0461daa05fee6 100644 --- a/compiler/backend/build.gradle.kts +++ b/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) } diff --git a/compiler/cli/cli-base/build.gradle.kts b/compiler/cli/cli-base/build.gradle.kts index 6aec1b9f48117..80ba1367ddf6d 100644 --- a/compiler/cli/cli-base/build.gradle.kts +++ b/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) } diff --git a/compiler/cli/cli-common/build.gradle.kts b/compiler/cli/cli-common/build.gradle.kts index 5f8f0eb9d349a..beed9bb6d98c4 100644 --- a/compiler/cli/cli-common/build.gradle.kts +++ b/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 { diff --git a/compiler/config.jvm/build.gradle.kts b/compiler/config.jvm/build.gradle.kts index bd7daa0b5e61b..7714a501e8a73 100644 --- a/compiler/config.jvm/build.gradle.kts +++ b/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 { diff --git a/compiler/fir/fir2ir/jvm-backend/build.gradle.kts b/compiler/fir/fir2ir/jvm-backend/build.gradle.kts index 50b66b999ebc5..c5346f15ab3bd 100644 --- a/compiler/fir/fir2ir/jvm-backend/build.gradle.kts +++ b/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() diff --git a/compiler/fir/java/build.gradle.kts b/compiler/fir/java/build.gradle.kts index 6559b2d1229ef..f46e7029cc1df 100644 --- a/compiler/fir/java/build.gradle.kts +++ b/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) } diff --git a/compiler/frontend.common.jvm/build.gradle.kts b/compiler/frontend.common.jvm/build.gradle.kts index 616643c59fd72..8a0ac70909fca 100644 --- a/compiler/frontend.common.jvm/build.gradle.kts +++ b/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")) diff --git a/compiler/frontend.java/build.gradle.kts b/compiler/frontend.java/build.gradle.kts index aeaba5b1d3864..ef6775ba6c19f 100644 --- a/compiler/frontend.java/build.gradle.kts +++ b/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) } diff --git a/compiler/ir/backend.jvm/build.gradle.kts b/compiler/ir/backend.jvm/build.gradle.kts index e82351353cde4..ac6d020a01da8 100644 --- a/compiler/ir/backend.jvm/build.gradle.kts +++ b/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() diff --git a/compiler/light-classes/build.gradle.kts b/compiler/light-classes/build.gradle.kts index f04bfdc64a951..8f75783fe6023 100644 --- a/compiler/light-classes/build.gradle.kts +++ b/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")) } diff --git a/compiler/preloader/build.gradle.kts b/compiler/preloader/build.gradle.kts index e38eb908fc532..2676fc92bbf6a 100644 --- a/compiler/preloader/build.gradle.kts +++ b/compiler/preloader/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } dependencies { - compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) + compileOnly(libs.intellij.asm) } sourceSets { diff --git a/compiler/resolution.common.jvm/build.gradle.kts b/compiler/resolution.common.jvm/build.gradle.kts index ddf6685d6387d..d68a9363c1c1e 100644 --- a/compiler/resolution.common.jvm/build.gradle.kts +++ b/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) } diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 6ea76c581088b..8955b0de96fe0 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/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()) diff --git a/compiler/tests-compiler-utils/build.gradle.kts b/compiler/tests-compiler-utils/build.gradle.kts index df9857c57da9e..cde05426b7073 100644 --- a/compiler/tests-compiler-utils/build.gradle.kts +++ b/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()) } diff --git a/compiler/util/build.gradle.kts b/compiler/util/build.gradle.kts index d420a2e211dcb..5b49ec04981ef 100644 --- a/compiler/util/build.gradle.kts +++ b/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 } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5c84583e95f17..a1e0537b95bdd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,8 +30,8 @@ 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" @@ -39,6 +39,7 @@ 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" } diff --git a/gradle/versions.properties b/gradle/versions.properties index a8c03185acee5..ab9e6e01aa01a 100644 --- a/gradle/versions.properties +++ b/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 diff --git a/jps/jps-platform-api-signatures/build.gradle.kts b/jps/jps-platform-api-signatures/build.gradle.kts index ffa486b7a3e30..b1d3a1a1df100 100644 --- a/jps/jps-platform-api-signatures/build.gradle.kts +++ b/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()) } diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts index b73232a24caa7..26e8ab88dc0e9 100644 --- a/libraries/kotlinx-metadata/jvm/build.gradle.kts +++ b/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 } } diff --git a/libraries/tools/abi-comparator/build.gradle.kts b/libraries/tools/abi-comparator/build.gradle.kts index e8063c3ad4ecb..03ee8b61b4dc4 100644 --- a/libraries/tools/abi-comparator/build.gradle.kts +++ b/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")) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts index c4222a255944c..582d1c9742c04 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/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") diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index fe222d58f08c8..534aaf79cd24a 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/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 } diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts index d6de1bf9df8be..b9b5cf20f187b 100644 --- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts +++ b/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")) diff --git a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts index 7159e63a43597..928a3d4ce4fdf 100644 --- a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts +++ b/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")) diff --git a/plugins/fir-plugin-prototype/build.gradle.kts b/plugins/fir-plugin-prototype/build.gradle.kts index a91520ffb3b3a..772d9ac2ef204 100644 --- a/plugins/fir-plugin-prototype/build.gradle.kts +++ b/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) diff --git a/plugins/jvm-abi-gen/build.gradle.kts b/plugins/jvm-abi-gen/build.gradle.kts index 76160588279e3..a82a49c073fb1 100644 --- a/plugins/jvm-abi-gen/build.gradle.kts +++ b/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")) diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index afad13a3f4ee7..0da2ccf1d6d3f 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/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 } diff --git a/plugins/noarg/noarg.backend/build.gradle.kts b/plugins/noarg/noarg.backend/build.gradle.kts index 9151a092acd50..c963860ab7a59 100644 --- a/plugins/noarg/noarg.backend/build.gradle.kts +++ b/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()) } diff --git a/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts b/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts index d84fa8cb4cde8..b915d3e684968 100644 --- a/plugins/parcelize/parcelize-compiler/parcelize.backend/build.gradle.kts +++ b/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() diff --git a/plugins/scripting/scripting-compiler-impl/build.gradle.kts b/plugins/scripting/scripting-compiler-impl/build.gradle.kts index 543b9bf174f05..2582e55fdade0 100644 --- a/plugins/scripting/scripting-compiler-impl/build.gradle.kts +++ b/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()) diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 90ab854411852..435c382032c1b 100644 --- a/prepare/compiler/build.gradle.kts +++ b/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} diff --git a/test-instrumenter/build.gradle.kts b/test-instrumenter/build.gradle.kts index 1c446dbc6c46b..207f9379bce02 100644 --- a/test-instrumenter/build.gradle.kts +++ b/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 {