Build: Fix intellij dependency leak from ir tree module

compiler/android-tests/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
     testCompile(project(":compiler:frontend.java"))
     testCompile(projectTests(":jps-plugin"))
     testCompile(commonDep("junit:junit"))
-    testCompile(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "groovy-all", "jps-builders", rootProject = rootProject) }
+    testCompile(intellijDep()) { includeJars("openapi", "util", "idea", "idea_rt", "groovy-all", "jps-builders", rootProject = rootProject) }
     testCompile(jpsStandalone()) { includeJars("jps-model") }
     testCompile(jpsBuildTest())
 }

compiler/backend/build.gradle.kts

@@ -10,7 +10,8 @@ dependencies {
     compile(project(":compiler:frontend"))
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:serialization"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) }
+    compileOnly(intellijDep()) { includeJars("trove4j", rootProject = rootProject) }
 }
 
 sourceSets {

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

@@ -19,6 +19,8 @@ dependencies {
     compile(project(":js:js.serializer"))
     compile(project(":js:js.dce"))
 
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+
     testCompile(project(":compiler:backend"))
     testCompile(project(":compiler:cli"))
     testCompile(projectTests(":compiler:tests-common"))

compiler/daemon/build.gradle.kts

@@ -23,7 +23,10 @@ dependencies {
     compile(project(":compiler:incremental-compilation-impl"))
     compile(commonDep("org.fusesource.jansi", "jansi"))
     compile(commonDep("org.jline", "jline"))
+
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijDep()) { includeJars("trove4j") }
+
     runtime(project(":kotlin-reflect"))
 
     embedded(project(":daemon-common")) { isTransitive = false }

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> {

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

@@ -9,7 +9,8 @@ dependencies {
     compile(project(":compiler:ir.tree"))
     compile(project(":compiler:ir.psi2ir"))
     compile(project(":compiler:ir.backend.common"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", "guava", rootProject = rootProject) }
+    compileOnly(intellijDep()) { includeJars("trove4j", rootProject = rootProject) }
 }
 
 sourceSets {

compiler/ir/ir.tree/build.gradle.kts

@@ -5,7 +5,6 @@ plugins {
 }
 
 dependencies {
-    compile(intellijDep())
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }

compiler/ir/serialization.js/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
+    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
     testCompile(project(":compiler:frontend"))
     testCompile(project(":compiler:cli"))
     testCompile(project(":compiler:util"))

compiler/tests-common/build.gradle.kts

@@ -40,7 +40,7 @@ dependencies {
     testCompile(androidDxJar()) { isTransitive = false }
     testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testCompile(intellijDep()) {
-        includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "bootstrap", rootProject = rootProject)
+        includeJars("openapi", "util", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "bootstrap", rootProject = rootProject)
         isTransitive = false
     }
 }

generators/test-generator/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    compile(intellijDep()) { includeJars("util") }
+    testCompile(intellijDep()) { includeJars("util") }
     testCompile(project(":core:util.runtime"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(kotlinStdlib())

idea-runner/build.gradle.kts

@@ -10,8 +10,7 @@ dependencies {
     compileOnly(project(":idea:idea-gradle"))
     compileOnly(project(":idea:idea-jvm"))
 
-    compile(intellijDep())
-
+    runtimeOnly(intellijDep())
     runtimeOnly(intellijRuntimeAnnotations())
     runtimeOnly(files(toolsJar()))
 }

idea/fir-view/build.gradle.kts

@@ -20,9 +20,8 @@ dependencies {
 
     compile(project(":idea:idea-core"))
 
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeJars("util", "openapi", "idea", "asm-all", "jdom", "trove4j", "guava", rootProject = rootProject) }
-    compileOnly(intellijPluginDep("gradle")) //{ includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
+    compileOnly(intellijDep())
+    compileOnly(intellijPluginDep("gradle"))
 }
 
 sourceSets {

idea/idea-core/build.gradle.kts

@@ -20,12 +20,8 @@ dependencies {
     compile(project(":kotlin-scripting-compiler-impl"))
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) {
-        Ide.IJ191.orHigher {
-            this@compileOnly.includeJars("platform-api")
-        }
-    }
+
+    compileOnly(intellijDep())
     compileOnly(intellijPluginDep("gradle"))
 }
 

idea/idea-j2k/build.gradle.kts

@@ -6,6 +6,8 @@ plugins {
 dependencies {
     compile(project(":j2k"))
     compile(project(":idea:idea-core"))
+
+    compileOnly(intellijDep())
 }
 
 sourceSets {

idea/idea-native/build.gradle.kts

@@ -10,6 +10,9 @@ dependencies {
     compile(project(":compiler:frontend"))
     compileOnly(intellijDep())
     compile(project(":kotlin-native:kotlin-native-library-reader"))
+    
+    testCompileOnly(intellijDep())
+    testRuntimeOnly(intellijDep())
 }
 
 sourceSets {

idea/jvm-debugger/eval4j/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
     compile(kotlinStdlib())
     compile(project(":compiler:backend"))
     compile(files(toolsJar()))
-    compileOnly(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
     testCompile(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }

idea/jvm-debugger/jvm-debugger-core/build.gradle.kts

@@ -12,6 +12,7 @@ dependencies {
     compile(project(":idea:jvm-debugger:jvm-debugger-util"))
     compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
 
+    compileOnly(intellijDep())
     compileOnly(intellijPluginDep("stream-debugger"))
 
     testCompile(project(":kotlin-test:kotlin-test-junit"))

idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts

@@ -11,6 +11,8 @@ dependencies {
     compile(project(":idea:jvm-debugger:jvm-debugger-util"))
     compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
 
+    compileOnly(intellijDep())
+
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
 }

idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts

@@ -8,6 +8,7 @@ dependencies {
     compile(project(":idea:ide-common"))
     compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
 
+    compileOnly(intellijDep())
     compileOnly(intellijPluginDep("stream-debugger"))
 
     testCompile(project(":kotlin-test:kotlin-test-junit"))

idea/jvm-debugger/jvm-debugger-util/build.gradle.kts

@@ -13,6 +13,8 @@ dependencies {
 
     compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
 
+    compileOnly(intellijDep())
+
     testCompile(commonDep("junit:junit"))
 }
 

j2k/build.gradle.kts

@@ -22,10 +22,8 @@ dependencies {
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
 
-    when {
-        Ide.IJ181.orHigher() || Ide.AS33.orHigher() -> testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") }
-        Ide.AS32() -> testCompileOnly(intellijDep()) { includeJars("idea") }
-    }
+    testCompileOnly(intellijDep())
+
     testCompile(project(":idea:idea-native")) { isTransitive = false }
     testCompile(project(":idea:idea-gradle-native")) { isTransitive = false }
 

jps-plugin/build.gradle.kts

@@ -37,16 +37,14 @@ dependencies {
     Ide.IJ {
         testCompile(intellijDep("devkit"))
     }
-    if (Platform[181].orHigher()) {
-        testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") }
-    } else {
-        testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") }
-    }
+
+    testCompile(intellijDep())
+
     testCompile(jpsBuildTest())
     compilerModules.forEach {
         testRuntime(project(it))
     }
-    testRuntime(intellijDep())
+
     testRuntime(project(":kotlin-reflect"))
     testRuntime(project(":kotlin-script-runtime"))
 }

libraries/scripting/jvm-host/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
     compileOnly(project(":kotlin-scripting-compiler"))
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":kotlin-reflect-api"))
-    compileOnly(intellijCoreDep())
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
 
 sourceSets {

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

@@ -75,7 +75,8 @@ dependencies {
     compileOnly("com.android.tools.build:gradle-core:3.0.0") { isTransitive = false }
     compileOnly("com.android.tools.build:builder-model:3.0.0") { isTransitive = false }
 
-    testCompileOnly (project(":compiler"))
+    testCompileOnly(intellijDep()) { includeJars("serviceMessages", "junit", rootProject = rootProject) }
+    testCompileOnly(project(":compiler"))
     testCompile(projectTests(":kotlin-build-common"))
     testCompile(project(":kotlin-android-extensions"))
     testCompile(project(":kotlin-compiler-runner"))

nj2k/build.gradle.kts

@@ -15,7 +15,9 @@ dependencies {
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:light-classes"))
     compile(project(":compiler:util"))
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+    compileOnly(intellijDep()) { includeJars("platform-api", "java-impl", "platform-impl", rootProject = rootProject) }
 
     testCompile(project(":idea"))
     testCompile(projectTests(":j2k"))
@@ -25,10 +27,8 @@ dependencies {
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
 
-    when {
-        Ide.IJ181.orHigher() || Ide.AS33.orHigher() -> testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") }
-        Ide.AS32() -> testCompileOnly(intellijDep()) { includeJars("idea") }
-    }
+    testCompileOnly(intellijDep())
+
     testCompile(project(":idea:idea-native")) { isTransitive = false }
     testCompile(project(":idea:idea-gradle-native")) { isTransitive = false }
 

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

@@ -15,6 +15,8 @@ dependencies {
     compileOnly(project(":compiler:plugin-api"))
     compileOnly(project(":kotlin-build-common"))
 
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
+
     runtimeOnly(project(":kotlin-compiler"))
 
     testCompile(commonDep("junit:junit"))

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

@@ -6,6 +6,8 @@ plugins {
 dependencies {
     compile(project(":compiler:cli"))
 
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
+
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(projectTests(":compiler"))
     testCompile(commonDep("junit:junit"))

plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
 
     compile(project(":compiler:plugin-api"))
     compile(project(":compiler:frontend"))

plugins/kotlin-serialization/kotlin-serialization-ide/build.gradle.kts

@@ -15,6 +15,9 @@ dependencies {
     compileOnly(intellijDep())
     excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) }
     compileOnly(intellijPluginDep("gradle"))
+
+    testCompileOnly(intellijDep())
+    testRuntimeOnly(intellijDep())
 }
 
 sourceSets {

plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts

@@ -21,9 +21,9 @@ dependencies {
     compile(project(":idea"))
     compile(project(":idea:idea-jvm"))
 
-    compile(intellijDep()) { includeJars("openapi", "extensions", "util") }
+    compileOnly(intellijDep()) { includeJars("openapi", "extensions", "util") }
     Platform[181].orHigher {
-        compile(intellijDep()) { includeJars("platform-api") }
+        compileOnly(intellijDep()) { includeJars("platform-api") }
     }
 }
 

plugins/uast-kotlin/build.gradle.kts

@@ -12,11 +12,9 @@ dependencies {
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:light-classes"))
 
-    Platform[181].orHigher {
-        // BEWARE: Uast should not depend on IDEA.
-        compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-        compileOnly(intellijDep()) { includeJars("java-api", "java-impl", "asm-all", rootProject = rootProject) }
-    }
+    // BEWARE: Uast should not depend on IDEA.
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
+    compileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
 
     testCompile(project(":kotlin-test:kotlin-test-jvm"))
     testCompile(projectTests(":compiler:tests-common"))
@@ -25,9 +23,8 @@ dependencies {
     testCompile(project(":compiler:cli"))
     testCompile(projectTests(":idea:idea-test-framework"))
 
-    Platform[181].orHigher {
-        testCompileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
-    }
+    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijDep()) { includeJars("java-api", "java-impl") }
 
     testCompile(project(":idea:idea-native")) { isTransitive = false }
     testCompile(project(":idea:idea-gradle-native")) { isTransitive = false }

ultimate/build.gradle.kts

@@ -74,8 +74,9 @@ dependencies {
     testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false }
 
     if (intellijUltimateEnabled) {
-        testCompileOnly(intellijUltimateDep()) { includeJars("platform-api", "platform-impl", "gson", "trove4j", "openapi", "idea", "util", "jdom", rootProject = rootProject) }
+        testCompileOnly(intellijUltimateDep())
     }
+    
     testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
 
     testRuntime(project(":kotlin-reflect"))

ultimate/ultimate-runner/build.gradle.kts

@@ -9,7 +9,7 @@ dependencies {
     compileOnly(project(":idea:idea-gradle"))
     compileOnly(project(":idea:idea-jvm"))
 
-    compile(intellijDep())
+    runtimeOnly(intellijDep())
     runtimeOnly(files(toolsJar()))
 }