Skip to content

Commit 9bfb6e5

Browse files
ALikhachevSpace Team
authored and
Space Team
committed
[Build] Migrate ASM dependency to the version catalog
1 parent c4cb038 commit 9bfb6e5

File tree

35 files changed

+38
-37
lines changed

35 files changed

+38
-37
lines changed

analysis/analysis-api/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
implementation(project(":analysis:kt-references"))
2222

2323
api(intellijCore())
24-
api(commonDependency("org.jetbrains.intellij.deps:asm-all"))
24+
api(libs.intellij.asm)
2525
api(libs.guava)
2626
}
2727

build-common/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
1919

2020
compileOnly(intellijCore())
21-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
21+
compileOnly(libs.intellij.asm)
2222
compileOnly(project(":compiler:build-tools:kotlin-build-statistics"))
2323

2424
testCompileOnly(project(":compiler:cli-common"))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
dependencies {
77
api(project(":core:compiler.common.jvm"))
88
api(project(":compiler:config.jvm"))
9-
api(commonDependency("org.jetbrains.intellij.deps:asm-all"))
9+
api(libs.intellij.asm)
1010
api(libs.guava)
1111
compileOnly(intellijCore())
1212
}

compiler/backend/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
api(project(":compiler:backend.common.jvm"))
1414
compileOnly(intellijCore())
1515
compileOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
16-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
16+
compileOnly(libs.intellij.asm)
1717
compileOnly(libs.guava)
1818
}
1919

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
compileOnly(toolsJarApi())
2323
compileOnly(intellijCore())
2424
compileOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
25-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
25+
compileOnly(libs.intellij.asm)
2626
runtimeOnly(libs.kotlinx.coroutines.core)
2727
}
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
1616
compileOnly(intellijCore())
1717
compileOnly(libs.guava)
18-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
18+
compileOnly(libs.intellij.asm)
1919
}
2020

2121
sourceSets {

compiler/config.jvm/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
dependencies {
88
api(project(":compiler:config"))
99
api(project(":core:compiler.common.jvm"))
10-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
10+
compileOnly(libs.intellij.asm)
1111
}
1212

1313
sourceSets {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
compileOnly(project(":compiler:ir.actualization"))
2222

2323
compileOnly(intellijCore())
24-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
24+
compileOnly(libs.intellij.asm)
2525
}
2626

2727
optInToUnsafeDuringIrConstructionAPI()

compiler/fir/java/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
implementation(project(":core:deserialization.common.jvm"))
1919

2020
compileOnly(intellijCore())
21-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
21+
compileOnly(libs.intellij.asm)
2222
}
2323

2424

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
api(project(":core:deserialization.common.jvm"))
1010
implementation(project(":core:compiler.common.jvm"))
1111
compileOnly(intellijCore())
12-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
12+
compileOnly(libs.intellij.asm)
1313

1414
implementation(project(":core:descriptors.jvm"))
1515
api(project(":compiler:psi"))

compiler/frontend.java/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
api(project(":compiler:frontend.common.jvm"))
1515

1616
compileOnly(intellijCore())
17-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
17+
compileOnly(libs.intellij.asm)
1818
compileOnly(libs.guava)
1919
}
2020

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
api(project(":compiler:ir.backend.common"))
1010
api(project(":compiler:backend.common.jvm"))
1111
compileOnly(intellijCore())
12-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
12+
compileOnly(libs.intellij.asm)
1313
}
1414

1515
optInToUnsafeDuringIrConstructionAPI()

compiler/light-classes/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
api(project(":compiler:frontend"))
1111
api(project(":compiler:frontend.java"))
1212
compileOnly(intellijCore())
13-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
13+
compileOnly(libs.intellij.asm)
1414
compileOnly(libs.guava)
1515
compileOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
1616
}

compiler/preloader/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
dependencies {
10-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
10+
compileOnly(libs.intellij.asm)
1111
}
1212

1313
sourceSets {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies {
1111
implementation(commonDependency("io.javaslang","javaslang"))
1212
compileOnly(intellijCore())
1313
compileOnly(libs.kotlinx.coroutines.core.jvm)
14-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
14+
compileOnly(libs.intellij.asm)
1515
compileOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
1616
compileOnly(libs.guava)
1717
}

compiler/tests-common/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ dependencies {
7777
testApi(intellijJavaRt()) // for FileComparisonFailure
7878

7979
testImplementation(libs.guava)
80-
testImplementation(commonDependency("org.jetbrains.intellij.deps:asm-all"))
80+
testImplementation(libs.intellij.asm)
8181
testImplementation(commonDependency("org.jetbrains.intellij.deps:log4j"))
8282
testImplementation(intellijJDom())
8383

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies {
3131

3232
testApi(libs.guava)
3333
testApi(commonDependency("org.jetbrains.intellij.deps:trove4j"))
34-
testApi(commonDependency("org.jetbrains.intellij.deps:asm-all"))
34+
testApi(libs.intellij.asm)
3535
testApi(commonDependency("org.jetbrains.intellij.deps:log4j"))
3636
testApi(intellijJDom())
3737
}

compiler/util/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313

1414
compileOnly(intellijCore())
1515
compileOnly(commonDependency("org.jetbrains.intellij.deps:log4j"))
16-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
16+
compileOnly(libs.intellij.asm)
1717
compileOnly(jpsModel()) { isTransitive = false }
1818
compileOnly(jpsModelImpl()) { isTransitive = false }
1919

gradle/libs.versions.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,16 @@ opentest4j = "1.3.0" # should be consistent with the version brought by junit-pl
3030
android-gradle-plugin = "7.3.1"
3131
android-tools = "30.3.1"
3232
gradle-node = "7.0.1"
33-
commons-text="1.10.0"
34-
lincheck="2.28.1"
33+
commons-text = "1.10.0"
34+
lincheck = "2.28.1"
3535
xerces = "2.12.2"
3636
# Compose versions used for Compose compiler plugin tests
3737
compose-stable = "1.7.0-alpha08"
3838
compose-snapshot-id = "12192498"
3939
compose-snapshot-version = "1.8.0-SNAPSHOT"
4040
ant = "1.10.14"
4141
kotlin-for-gradle-plugins-compilation = "2.0.20-RC"
42+
intellij-asm = "9.0"
4243
# Wasm specific
4344
wasmedge = "0.14.0"
4445

@@ -97,6 +98,7 @@ android-tools-common = { module = "com.android.tools:common", version.ref = "and
9798
xerces = { module = "xerces:xercesImpl", version.ref = "xerces" }
9899

99100
ant = { module = "org.apache.ant:ant", version.ref = "ant" }
101+
intellij-asm = { module = "org.jetbrains.intellij.deps:asm-all", version.ref = "intellij-asm" }
100102

101103
[plugins]
102104
jetbrains-ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "jetbrains-ideaExt" }

gradle/versions.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ versions.intellijSdk=233.13135.103
33
# versions.* should match library versions used in IDEA from versions.intellijSdk
44

55
versions.annotations=21.0.0
6-
versions.asm-all=9.0
76
versions.commons-lang=2.4
87
versions.aalto-xml=1.3.0
98
versions.gradle-api=4.5.1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88

99
dependencies {
1010
implementation(kotlinStdlib())
11-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
11+
compileOnly(libs.intellij.asm)
1212
compileOnly(intellijPlatformUtil())
1313
}
1414

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
embedded(protobufLite())
3131
testImplementation(kotlinTest("junit"))
3232
testImplementation(libs.junit4)
33-
testImplementation(commonDependency("org.jetbrains.intellij.deps:asm-all"))
33+
testImplementation(libs.intellij.asm)
3434
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
3535
}
3636

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
dependencies {
8-
implementation(commonDependency("org.jetbrains.intellij.deps:asm-all"))
8+
implementation(libs.intellij.asm)
99
implementation(commonDependency("org.apache.commons:commons-text"))
1010

1111
implementation(project(":tools:kotlinp-jvm"))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ dependencies {
113113

114114
testRuntimeOnly(project(":compiler:tests-mutes"))
115115

116-
testCompileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
116+
testCompileOnly(libs.intellij.asm)
117117
}
118118

119119
val konanDataDir: String = System.getProperty("konanDataDirForIntegrationTests")

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ dependencies {
134134
commonCompileOnly(project(":kotlin-tooling-metadata"))
135135
commonCompileOnly(project(":compiler:build-tools:kotlin-build-statistics"))
136136
commonCompileOnly(project(":native:swift:swift-export-standalone"))
137-
commonCompileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) { isTransitive = false }
137+
commonCompileOnly(libs.intellij.asm) { isTransitive = false }
138138

139139
commonImplementation(project(":kotlin-gradle-plugin-idea"))
140140
commonImplementation(project(":kotlin-gradle-plugin-idea-proto"))
@@ -157,7 +157,7 @@ dependencies {
157157

158158
embedded(project(":kotlin-gradle-build-metrics"))
159159
embedded(project(":kotlin-gradle-statistics"))
160-
embedded(commonDependency("org.jetbrains.intellij.deps:asm-all")) { isTransitive = false }
160+
embedded(libs.intellij.asm) { isTransitive = false }
161161
embedded(commonDependency("com.google.code.gson:gson")) { isTransitive = false }
162162
embedded(libs.guava) { isTransitive = false }
163163
embedded(commonDependency("org.jetbrains.teamcity:serviceMessages")) { isTransitive = false }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies {
2929
compileOnly(project(":compiler:cli"))
3030
compileOnly(project(":kotlin-android-extensions-runtime"))
3131
compileOnly(intellijCore())
32-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
32+
compileOnly(libs.intellij.asm)
3333

3434
testApi(project(":compiler:util"))
3535
testApi(project(":compiler:backend"))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ repositories {
5858

5959
dependencies {
6060
compileOnly(intellijCore())
61-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
61+
compileOnly(libs.intellij.asm)
6262

6363
compileOnly(project(":compiler:plugin-api"))
6464
compileOnly(project(":compiler:cli-common"))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717
compileOnly(project(":compiler:fir:entrypoint"))
1818
compileOnly(project(":compiler:plugin-api"))
1919
compileOnly(intellijCore())
20-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
20+
compileOnly(libs.intellij.asm)
2121

2222
testApi(platform(libs.junit.bom))
2323
testImplementation(libs.junit.jupiter.api)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
embedded(project(":kotlin-metadata-jvm"))
3939

4040
compileOnly(intellijCore())
41-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
41+
compileOnly(libs.intellij.asm)
4242

4343
testImplementation(libs.junit4)
4444
testImplementation(projectTests(":compiler:tests-common"))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
compileOnly(project(":kotlin-annotation-processing-runtime"))
2020
compileOnly(intellijCore())
2121
compileOnly(toolsJarApi())
22-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
22+
compileOnly(libs.intellij.asm)
2323

2424
testImplementation(intellijCore())
2525
testRuntimeOnly(intellijResources()) { isTransitive = false }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
compileOnly(project(":compiler:backend"))
1010
compileOnly(project(":compiler:ir.backend.common"))
1111
compileOnly(intellijCore())
12-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
12+
compileOnly(libs.intellij.asm)
1313
implementation(kotlinStdlib())
1414
}
1515

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
compileOnly(project(":compiler:ir.tree"))
1616
compileOnly(project(":compiler:fir:tree"))
1717
compileOnly(intellijCore())
18-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
18+
compileOnly(libs.intellij.asm)
1919
}
2020

2121
optInToUnsafeDuringIrConstructionAPI()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
api(kotlinStdlib())
2020
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
2121
compileOnly(intellijCore())
22-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
22+
compileOnly(libs.intellij.asm)
2323

2424
// FIXME: drop after removing references to LocalFileSystem they don't exist in intellij-core
2525
compileOnly(intellijAnalysis())

prepare/compiler/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ dependencies {
233233
fatJarContents(commonDependency("org.jetbrains.intellij.deps.jna:jna-platform")) { isTransitive = false }
234234
fatJarContents(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
235235
fatJarContents(commonDependency("org.lz4:lz4-java")) { isTransitive = false }
236-
fatJarContents(commonDependency("org.jetbrains.intellij.deps:asm-all")) { isTransitive = false }
236+
fatJarContents(libs.intellij.asm) { isTransitive = false }
237237
fatJarContents(libs.guava) { isTransitive = false }
238238
//Gson is needed for kotlin-build-statistics. Build statistics could be enabled for JPS and Gradle builds. Gson will come from inteliij or KGP.
239239
proguardLibraries(commonDependency("com.google.code.gson:gson")) { isTransitive = false}

test-instrumenter/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
dependencies {
99
api(kotlinStdlib())
1010
compileOnly(intellijCore())
11-
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
11+
compileOnly(libs.intellij.asm)
1212
}
1313

1414
sourceSets {

0 commit comments

Comments
 (0)