Fork common-util for intellij dependences

so that they can be built with different versions
google · Jun 29, 2024 · bd04d69 · bd04d69
1 parent 9d33227
commit bd04d69
Show file tree

Hide file tree

Showing 13 changed files with 800 additions and 19 deletions.
diff --git a/common-util/build.gradle.kts b/common-util/build.gradle.kts
@@ -4,7 +4,6 @@ evaluationDependsOn(":api")
 
 description = "Kotlin Symbol Processing Util"
 
-val intellijVersion: String by project
 val junitVersion: String by project
 val kotlinBaseVersion: String by project
 
@@ -18,26 +17,8 @@ plugins {
 }
 
 dependencies {
-    listOf(
-        "com.jetbrains.intellij.platform:util-rt",
-        "com.jetbrains.intellij.platform:util-class-loader",
-        "com.jetbrains.intellij.platform:util-text-matching",
-        "com.jetbrains.intellij.platform:util",
-        "com.jetbrains.intellij.platform:util-base",
-        "com.jetbrains.intellij.platform:util-xml-dom",
-        "com.jetbrains.intellij.platform:core",
-        "com.jetbrains.intellij.platform:core-impl",
-        "com.jetbrains.intellij.platform:extensions",
-        "com.jetbrains.intellij.java:java-frontback-psi",
-        "com.jetbrains.intellij.java:java-psi",
-        "com.jetbrains.intellij.java:java-psi-impl",
-    ).forEach {
-        implementation("$it:$intellijVersion") { isTransitive = false }
-    }
-
     implementation(project(":api"))
     implementation(kotlin("stdlib", kotlinBaseVersion))
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
     testImplementation("junit:junit:$junitVersion")
 }
 

diff --git a/compiler-plugin/build.gradle.kts b/compiler-plugin/build.gradle.kts
@@ -53,6 +53,7 @@ dependencies {
     implementation(kotlin("stdlib", kotlinBaseVersion))
 
     compileOnly("org.jetbrains.kotlin:kotlin-compiler:$kotlinBaseVersion")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
 
     implementation(project(":api"))
     implementation(project(":common-util"))

diff --git a/...ools/ksp/common/IncrementalContextBase.kt → ...ools/ksp/common/IncrementalContextBase.kt b/...ools/ksp/common/IncrementalContextBase.kt → ...ools/ksp/common/IncrementalContextBase.kt
diff --git a/...ools/ksp/common/IncrementalWrapperBase.kt → ...ools/ksp/common/IncrementalWrapperBase.kt b/...ools/ksp/common/IncrementalWrapperBase.kt → ...ools/ksp/common/IncrementalWrapperBase.kt
diff --git a/...ogle/devtools/ksp/common/PersistentMap.kt → ...ogle/devtools/ksp/common/PersistentMap.kt b/...ogle/devtools/ksp/common/PersistentMap.kt → ...ogle/devtools/ksp/common/PersistentMap.kt
diff --git a/...om/google/devtools/ksp/common/PsiUtils.kt → ...om/google/devtools/ksp/common/PsiUtils.kt b/...om/google/devtools/ksp/common/PsiUtils.kt → ...om/google/devtools/ksp/common/PsiUtils.kt
diff --git a/...ls/ksp/common/impl/KSPCompilationError.kt → ...ls/ksp/common/impl/KSPCompilationError.kt b/...ls/ksp/common/impl/KSPCompilationError.kt → ...ls/ksp/common/impl/KSPCompilationError.kt
diff --git a/kotlin-analysis-api/build.gradle.kts b/kotlin-analysis-api/build.gradle.kts
@@ -75,6 +75,7 @@ dependencies {
     }
 
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
     compileOnly(kotlin("stdlib", aaKotlinBaseVersion))
 
     implementation("com.google.guava:guava:$aaGuavaVersion")