Skip to content

Commit b635c1c

Browse files
committed
Fork common-util for intellij dependences
so that they can be built with different versions (cherry picked from commit bd04d69)
1 parent e99509f commit b635c1c

File tree

13 files changed

+800
-19
lines changed

13 files changed

+800
-19
lines changed

common-util/build.gradle.kts

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ evaluationDependsOn(":api")
44

55
description = "Kotlin Symbol Processing Util"
66

7-
val intellijVersion: String by project
87
val junitVersion: String by project
98
val kotlinBaseVersion: String by project
109

@@ -18,26 +17,8 @@ plugins {
1817
}
1918

2019
dependencies {
21-
listOf(
22-
"com.jetbrains.intellij.platform:util-rt",
23-
"com.jetbrains.intellij.platform:util-class-loader",
24-
"com.jetbrains.intellij.platform:util-text-matching",
25-
"com.jetbrains.intellij.platform:util",
26-
"com.jetbrains.intellij.platform:util-base",
27-
"com.jetbrains.intellij.platform:util-xml-dom",
28-
"com.jetbrains.intellij.platform:core",
29-
"com.jetbrains.intellij.platform:core-impl",
30-
"com.jetbrains.intellij.platform:extensions",
31-
"com.jetbrains.intellij.java:java-frontback-psi",
32-
"com.jetbrains.intellij.java:java-psi",
33-
"com.jetbrains.intellij.java:java-psi-impl",
34-
).forEach {
35-
implementation("$it:$intellijVersion") { isTransitive = false }
36-
}
37-
3820
implementation(project(":api"))
3921
implementation(kotlin("stdlib", kotlinBaseVersion))
40-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
4122
testImplementation("junit:junit:$junitVersion")
4223
}
4324

compiler-plugin/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ dependencies {
5353
implementation(kotlin("stdlib", kotlinBaseVersion))
5454

5555
compileOnly("org.jetbrains.kotlin:kotlin-compiler:$kotlinBaseVersion")
56+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
5657

5758
implementation(project(":api"))
5859
implementation(project(":common-util"))

kotlin-analysis-api/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ dependencies {
7575
}
7676

7777
implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4")
78+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
7879
compileOnly(kotlin("stdlib", aaKotlinBaseVersion))
7980

8081
implementation("com.google.guava:guava:$aaGuavaVersion")

0 commit comments

Comments
 (0)