Build: Fix intellij dependency leak from ir tree module

compiler/fir/dump/build.gradle.kts

@@ -22,6 +22,8 @@ dependencies {
     compile(project(":compiler:cli"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijDep()) { includeJars("commons-lang-2.4") }
+
     compile("org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.12")
 }
 

compiler/fir/fir2ir/build.gradle.kts

@@ -19,7 +19,7 @@ dependencies {
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
-    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) }
+    testCompileOnly(intellijDep())
 
     testRuntime(intellijDep())
 

compiler/fir/modularized-tests/build.gradle.kts

@@ -9,7 +9,10 @@ plugins {
 }
 
 dependencies {
-    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) }
+    testCompileOnly(intellijDep()) {
+        includeJars("openapi", "java-api", "extensions", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject)
+    }
+
     testRuntime(intellijDep())
 
     testCompile(commonDep("junit:junit"))

compiler/fir/psi2fir/build.gradle.kts

@@ -14,9 +14,9 @@ dependencies {
     compile(project(":compiler:fir:tree"))
     compile(project(":compiler:ir.tree"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    
-    testRuntime(intellijDep())
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+
+    testCompile(intellijDep())
 
     testCompile(commonDep("junit:junit"))
     testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
@@ -25,8 +25,6 @@ dependencies {
     
     testCompileOnly(project(":kotlin-reflect-api"))
     testRuntime(project(":kotlin-reflect"))
-
-
 }
 
 sourceSets {

compiler/fir/resolve/build.gradle.kts

@@ -10,9 +10,9 @@ dependencies {
     compile(project(":compiler:fir:cones"))
     compile(project(":compiler:fir:tree"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
 
-    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) }
+    testCompileOnly(intellijDep()) { includeJars("openapi", "java-api", "idea", "idea_rt", "util", "asm-all", "extensions", rootProject = rootProject) }
 
     testRuntime(intellijDep())
 

compiler/fir/tree/visitors-generator/build.gradle.kts

@@ -10,15 +10,17 @@ plugins {
     id("jps-compatible")
 }
 
+val runtimeOnly by configurations
+val compileOnly by configurations
+runtimeOnly.extendsFrom(compileOnly)
+
 dependencies {
     compile(project(":compiler:psi"))
 
-    compile(intellijCoreDep()) { includeJars("intellij-core") }
-    compile(intellijDep()) {
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+    compileOnly(intellijDep()) {
         includeJars("trove4j", "picocontainer", rootProject = rootProject)
-        isTransitive = false
     }
-    compile(intellijDep()) { includeJars("guava", rootProject = rootProject) }
 }
 
 val writeCopyright by task<WriteCopyrightToFile> {