Build: Make all compile dependencies on toolsJar compileOnly

tools.jar differs between different versions of JDK reducing cache reuse so better to not leak it to other modules GitOrigin-RevId: c83568256edcc965d72dacf555337b8107b5f231
2026-01-05 01:50:56 +07:00 · 2020-02-05 20:31:54 +03:00
parent faee26a57d
commit c34071001c
17 changed files with 25 additions and 8 deletions
--- a/plugins/kotlin/build.gradle.kts
+++ b/plugins/kotlin/build.gradle.kts
@@ -97,6 +97,7 @@ dependencies {
    compileOnly(intellijPluginDep("java-i18n"))
    compileOnly(intellijPluginDep("gradle"))

+    testCompileOnly(toolsJar())
    testCompileOnly(project(":kotlin-reflect-api")) // TODO: fix import (workaround for jps build)
    testCompile(project(":kotlin-test:kotlin-test-junit"))
    testCompile(projectTests(":compiler:tests-common"))
@@ -109,8 +110,8 @@ dependencies {
    testCompile(commonDep("junit:junit"))
    testCompileOnly(intellijPluginDep("coverage"))

+    testRuntimeOnly(toolsJar())
    testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false }
-
    testRuntime(commonDep("org.jetbrains", "markdown"))
    testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false }
    testRuntime(project(":kotlin-reflect"))
--- a/plugins/kotlin/gradle/gradle-idea/build.gradle.kts
+++ b/plugins/kotlin/gradle/gradle-idea/build.gradle.kts
@@ -53,6 +53,7 @@ dependencies {
    testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false }
    testRuntime(project(":idea:idea-new-project-wizard"))

+    testRuntimeOnly(toolsJar())
    testRuntime(project(":kotlin-reflect"))
    testRuntime(project(":idea:idea-jvm"))
    testRuntime(project(":idea:idea-android"))
--- a/plugins/kotlin/gradle/gradle-native/build.gradle.kts
+++ b/plugins/kotlin/gradle/gradle-native/build.gradle.kts
@@ -40,6 +40,7 @@ dependencies {
        compileOnly(intellijPluginDep("java"))
    }

+    testRuntimeOnly(toolsJar())
    testRuntime(project(":kotlin-reflect"))
    testRuntime(project(":idea:idea-jvm"))
    testRuntime(project(":idea:idea-android"))
--- a/plugins/kotlin/j2k/new/build.gradle.kts
+++ b/plugins/kotlin/j2k/new/build.gradle.kts
@@ -35,6 +35,7 @@ dependencies {

    testCompileOnly(intellijDep())

+    testRuntimeOnly(toolsJar())
    testRuntime(project(":idea:idea-jvm"))
    testRuntime(project(":sam-with-receiver-ide-plugin"))
    testRuntime(project(":allopen-ide-plugin"))
--- a/plugins/kotlin/j2k/old/build.gradle.kts
+++ b/plugins/kotlin/j2k/old/build.gradle.kts
@@ -32,6 +32,7 @@ dependencies {
    testCompile(project(":idea:idea-native")) { isTransitive = false }
    testCompile(project(":idea:idea-gradle-native")) { isTransitive = false }

+    testRuntimeOnly(toolsJar())
    testRuntime(project(":native:frontend.native")) { isTransitive = false }
    testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false }
    testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false }
--- a/plugins/kotlin/jps/jps-plugin/build.gradle.kts
+++ b/plugins/kotlin/jps/jps-plugin/build.gradle.kts
@@ -48,6 +48,7 @@ dependencies {
        testRuntimeOnly(intellijPluginDep("java"))
    }

+    testRuntimeOnly(toolsJar())
    testRuntime(project(":kotlin-reflect"))
    testRuntime(project(":kotlin-script-runtime"))
 }
--- a/plugins/kotlin/jvm-debugger/core/build.gradle.kts
+++ b/plugins/kotlin/jvm-debugger/core/build.gradle.kts
@@ -10,8 +10,8 @@ dependencies {
    compile(project(":idea:idea-core"))
    compile(project(":idea:ide-common"))
    compile(project(":idea:jvm-debugger:jvm-debugger-util"))
-    compile(toolsJar())

+    compileOnly(toolsJar())
    compileOnly(intellijDep())
    
    Platform[192].orHigher {
--- a/plugins/kotlin/jvm-debugger/coroutines/build.gradle.kts
+++ b/plugins/kotlin/jvm-debugger/coroutines/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 dependencies {
    compile(project(":idea:jvm-debugger:jvm-debugger-core"))

+    compileOnly(toolsJar())
    compileOnly(intellijDep())

    Platform[192].orHigher {
--- a/plugins/kotlin/jvm-debugger/eval4j/build.gradle.kts
+++ b/plugins/kotlin/jvm-debugger/eval4j/build.gradle.kts
@@ -6,8 +6,11 @@ plugins {
 dependencies {
    compile(kotlinStdlib())
    compile(project(":compiler:backend"))
-    compile(toolsJar())
+
+    compileOnly(toolsJar())
    compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
+
+    testCompileOnly(toolsJar())
    testCompile(project(":kotlin-test:kotlin-test-junit"))
    testCompile(commonDep("junit:junit"))
    testCompile(intellijDep()) { includeJars("asm-all", rootProject = rootProject) }
--- a/plugins/kotlin/jvm-debugger/evaluation/build.gradle.kts
+++ b/plugins/kotlin/jvm-debugger/evaluation/build.gradle.kts
@@ -9,7 +9,8 @@ dependencies {
    compile(project(":idea:idea-core"))
    compile(project(":idea:idea-j2k"))
    compile(project(":idea:jvm-debugger:jvm-debugger-util"))
-    compile(toolsJar())
+
+    compileOnly(toolsJar())
    Platform[192].orHigher {
        compileOnly(intellijPluginDep("java"))
    }
--- a/plugins/kotlin/jvm-debugger/sequence/build.gradle.kts
+++ b/plugins/kotlin/jvm-debugger/sequence/build.gradle.kts
@@ -6,8 +6,8 @@ plugins {
 dependencies {
    compile(project(":compiler:backend"))
    compile(project(":idea:ide-common"))
-    compile(toolsJar())

+    compileOnly(toolsJar())
    compileOnly(intellijDep())
    Platform[192].orHigher {
        compileOnly(intellijPluginDep("java"))
--- a/plugins/kotlin/jvm-debugger/util/build.gradle.kts
+++ b/plugins/kotlin/jvm-debugger/util/build.gradle.kts
@@ -11,8 +11,8 @@ dependencies {
    // TODO: get rid of this
    compile(project(":idea:jvm-debugger:eval4j"))

-    compile(toolsJar())
-    
+    compileOnly(toolsJar())
+
    Platform[192].orHigher {
        compileOnly(intellijPluginDep("java"))
    }
--- a/plugins/kotlin/jvm/build.gradle.kts
+++ b/plugins/kotlin/jvm/build.gradle.kts
@@ -9,6 +9,8 @@ dependencies {
    compile(project(":compiler:light-classes"))
    compile(project(":compiler:frontend.java"))
    compile(project(":compiler:backend.jvm"))
+
+    compileOnly(toolsJar())
    compileOnly(intellijDep())
    compileOnly(commonDep("com.google.code.findbugs", "jsr305"))

--- a/plugins/kotlin/maven/build.gradle.kts
+++ b/plugins/kotlin/maven/build.gradle.kts
@@ -45,6 +45,7 @@ dependencies {
    testRuntime(project(":native:frontend.native")) { isTransitive = false }
    testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false }

+    testRuntimeOnly(toolsJar())
    testRuntime(project(":kotlin-reflect"))
    testRuntime(project(":idea:idea-jvm"))
    testRuntime(project(":idea:idea-android"))
--- a/plugins/kotlin/scripting-support/build.gradle.kts
+++ b/plugins/kotlin/scripting-support/build.gradle.kts
@@ -34,6 +34,7 @@ dependencies {
        testRuntime(intellijPluginDep("java"))
    }

+    testRuntimeOnly(toolsJar())
    testRuntime(project(":kotlin-reflect"))

    testCompileOnly(intellijDep())
--- a/plugins/kotlin/tests-common/build.gradle.kts
+++ b/plugins/kotlin/tests-common/build.gradle.kts
@@ -38,11 +38,12 @@ dependencies {
    testCompileOnly(project(":plugins:android-extensions-compiler"))
    testCompile(project(":kotlin-test:kotlin-test-jvm"))
    testCompile(projectTests(":compiler:tests-common-jvm6"))
-    testCompileOnly(project(":kotlin-reflect-api"))
    testCompile(project(":kotlin-scripting-compiler-impl"))
    testCompile(commonDep("junit:junit"))
    testCompile(androidDxJar()) { isTransitive = false }
    testCompile(commonDep("com.android.tools:r8"))
+    testCompileOnly(project(":kotlin-reflect-api"))
+    testCompileOnly(toolsJar())
    testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
    Platform[193].orLower {
        testCompile(intellijDep()) { includeJars("openapi", "picocontainer", rootProject = rootProject) }
--- a/plugins/kotlin/uast/uast-kotlin/build.gradle.kts
+++ b/plugins/kotlin/uast/uast-kotlin/build.gradle.kts
@@ -38,6 +38,7 @@ dependencies {
    testCompile(project(":idea:idea-native")) { isTransitive = false }
    testCompile(project(":idea:idea-gradle-native")) { isTransitive = false }

+    testRuntimeOnly(toolsJar())
    testRuntime(project(":native:frontend.native")) { isTransitive = false }
    testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false }
    testRuntime(project(":kotlin-reflect"))