From a4f28cd94fd23cd219af25191e607e0de59ee7af Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 24 Nov 2017 17:42:06 +0100 Subject: [PATCH] Make all dependencies to idea sdk intransitive --- build-common/build.gradle.kts | 2 +- compiler/android-tests/build.gradle.kts | 4 +- compiler/backend-common/build.gradle.kts | 10 ++++ compiler/backend/build.gradle.kts | 11 ++++ compiler/build.gradle.kts | 5 +- compiler/cli/build.gradle.kts | 4 +- compiler/cli/cli-common/build.gradle.kts | 4 +- compiler/compiler-runner/build.gradle.kts | 10 ++++ .../conditional-preprocessor/build.gradle.kts | 4 +- compiler/container/build.gradle.kts | 3 +- compiler/daemon/build.gradle.kts | 4 +- .../daemon/daemon-common/build.gradle.kts | 4 +- compiler/frontend.java/build.gradle.kts | 11 ++++ compiler/frontend.script/build.gradle.kts | 10 ++++ compiler/frontend/build.gradle.kts | 11 ++++ .../build.gradle.kts | 13 +++++ compiler/ir/ir.psi2ir/build.gradle.kts | 10 ++++ compiler/light-classes/build.gradle.kts | 11 ++++ compiler/plugin-api/build.gradle.kts | 2 +- compiler/preloader/build.gradle.kts | 2 +- compiler/resolution/build.gradle.kts | 8 +++ compiler/tests-common/build.gradle.kts | 2 +- compiler/tests-java8/build.gradle.kts | 7 +++ compiler/util/build.gradle.kts | 6 +-- eval4j/build.gradle.kts | 3 +- generators/build.gradle.kts | 3 +- idea/build.gradle.kts | 14 ++--- idea/formatter/build.gradle.kts | 2 +- idea/ide-common/build.gradle.kts | 4 +- idea/idea-android/build.gradle.kts | 7 ++- .../build.gradle.kts | 7 +-- idea/idea-core/build.gradle.kts | 6 +-- idea/idea-gradle/build.gradle.kts | 3 +- idea/idea-jps-common/build.gradle.kts | 4 +- idea/idea-jvm/build.gradle.kts | 10 ++-- idea/idea-maven/build.gradle.kts | 2 +- idea/idea-test-framework/build.gradle.kts | 2 +- j2k/build.gradle.kts | 2 + jps-plugin/build.gradle.kts | 3 +- js/js.ast/build.gradle.kts | 5 +- js/js.dce/build.gradle.kts | 2 +- js/js.frontend/build.gradle.kts | 3 +- js/js.parser/build.gradle.kts | 2 +- js/js.serializer/build.gradle.kts | 2 +- js/js.tests/build.gradle.kts | 8 ++- js/js.translator/build.gradle.kts | 3 +- .../build.gradle | 18 +++++++ .../tools/kotlin-gradle-plugin/build.gradle | 17 ++++++ .../tools/kotlin-script-util/build.gradle.kts | 9 ++++ plugins/allopen/allopen-ide/build.gradle.kts | 6 +-- .../build.gradle.kts | 3 +- .../android-extensions-idea/build.gradle.kts | 8 ++- .../android-extensions-jps/build.gradle.kts | 1 + .../build.gradle.kts | 2 +- plugins/kapt3/kapt3-compiler/build.gradle.kts | 7 ++- plugins/kapt3/kapt3-idea/build.gradle.kts | 6 +-- plugins/lint/build.gradle.kts | 8 +-- plugins/noarg/noarg-cli/build.gradle.kts | 11 ++++ plugins/noarg/noarg-ide/build.gradle.kts | 6 +-- .../sam-with-receiver-cli/build.gradle.kts | 10 ++++ .../source-sections-compiler/build.gradle.kts | 7 ++- plugins/uast-kotlin-idea/build.gradle.kts | 8 +++ plugins/uast-kotlin/build.gradle.kts | 9 ++-- test-instrumenter/build.gradle.kts | 4 +- ultimate/build.gradle.kts | 52 ++++++++++++------- 65 files changed, 341 insertions(+), 106 deletions(-) diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index 4d74de75664..0a611eb6d99 100644 --- a/build-common/build.gradle.kts +++ b/build-common/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { afterEvaluate { dependencies { - compileOnly(intellij { include("util.jar") }) + compileOnly(intellij { include("annotations.jar", "asm-all.jar", "trove4j.jar", "util.jar") }) testCompileOnly(intellij { include("openapi.jar") }) } } diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts index e780400bb48..b4c4e57f30a 100644 --- a/compiler/android-tests/build.gradle.kts +++ b/compiler/android-tests/build.gradle.kts @@ -25,8 +25,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellij { include("openapi.jar") }) - testCompile(intellij { include("idea.jar", "idea_rt.jar", "groovy-all-*.jar", "jps-builders.jar") }) + compileOnly(intellij { include("openapi.jar") }) + testCompile(intellij { include("openapi.jar", "idea.jar", "idea_rt.jar", "groovy-all-*.jar", "jps-builders.jar") }) testCompile(intellijExtra("jps-standalone") { include("jps-model.jar") }) testCompile(intellijExtra("jps-build-test")) } diff --git a/compiler/backend-common/build.gradle.kts b/compiler/backend-common/build.gradle.kts index 9bd7b9cced4..d38f5c62990 100644 --- a/compiler/backend-common/build.gradle.kts +++ b/compiler/backend-common/build.gradle.kts @@ -3,6 +3,10 @@ apply { plugin("kotlin") } jvmTarget = "1.6" +configureIntellijPlugin { + setExtraDependencies("intellij-core") +} + dependencies { compile(project(":core:descriptors")) compile(project(":core:descriptors.jvm")) @@ -11,6 +15,12 @@ dependencies { compile(project(":compiler:ir.tree")) } +afterEvaluate { + dependencies { + compileOnly(intellijCoreJar()) + } +} + sourceSets { "main" { projectDefault() diff --git a/compiler/backend/build.gradle.kts b/compiler/backend/build.gradle.kts index c769ea9dbd8..82fd96a7292 100644 --- a/compiler/backend/build.gradle.kts +++ b/compiler/backend/build.gradle.kts @@ -3,6 +3,10 @@ apply { plugin("kotlin") } jvmTarget = "1.6" +configureIntellijPlugin { + setExtraDependencies("intellij-core") +} + dependencies { compile(project(":compiler:util")) compile(project(":compiler:backend-common")) @@ -13,6 +17,13 @@ dependencies { compile(project(":compiler:serialization")) } +afterEvaluate { + dependencies { + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("annotations.jar", "asm-all.jar", "trove4j.jar", "guava-*.jar") }) + } +} + sourceSets { "main" { projectDefault() diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index df0875ff1ef..2ae6793dc63 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -73,9 +73,10 @@ dependencies { afterEvaluate { dependencies { - testCompile(intellij { include("openapi.jar", "idea.jar", "util.jar", "asm-all.jar", "commons-httpclient-3.1-patched.jar") }) + testCompileOnly(intellijCoreJar()) + testCompileOnly(intellij { include("openapi.jar", "idea.jar", "idea_rt.jar", "util.jar", "asm-all.jar", + "commons-httpclient-3.1-patched.jar") }) testRuntime(intellij()) - testRuntime(intellijCoreJar()) } } diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts index 955185aea96..7f4278bda17 100644 --- a/compiler/cli/build.gradle.kts +++ b/compiler/cli/build.gradle.kts @@ -34,8 +34,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellijCoreJarDependencies()) + compileOnly(intellijCoreJar()) + compileOnly(intellijCoreJarDependencies()) } } diff --git a/compiler/cli/cli-common/build.gradle.kts b/compiler/cli/cli-common/build.gradle.kts index 5db83b47741..d9dbf66727f 100644 --- a/compiler/cli/cli-common/build.gradle.kts +++ b/compiler/cli/cli-common/build.gradle.kts @@ -17,8 +17,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellijCoreJarDependencies()) + compileOnly(intellijCoreJar()) + compileOnly(intellijCoreJarDependencies()) } } diff --git a/compiler/compiler-runner/build.gradle.kts b/compiler/compiler-runner/build.gradle.kts index debce36af1b..66a5e3adb3b 100644 --- a/compiler/compiler-runner/build.gradle.kts +++ b/compiler/compiler-runner/build.gradle.kts @@ -7,6 +7,10 @@ apply { plugin("kotlin") } jvmTarget = "1.6" +configureIntellijPlugin { + setExtraDependencies("intellij-core") +} + dependencies { compile(project(":kotlin-build-common")) compileOnly(project(":compiler:cli-common")) @@ -18,6 +22,12 @@ dependencies { runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable")) } +afterEvaluate { + dependencies { + compileOnly(intellijCoreJar()) + } +} + sourceSets { "main" { projectDefault() } "test" {} diff --git a/compiler/conditional-preprocessor/build.gradle.kts b/compiler/conditional-preprocessor/build.gradle.kts index 3c8ef41e332..d7e0d44ca48 100644 --- a/compiler/conditional-preprocessor/build.gradle.kts +++ b/compiler/conditional-preprocessor/build.gradle.kts @@ -19,8 +19,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellijCoreJarDependencies()) + compileOnly(intellijCoreJar()) + compileOnly(intellijCoreJarDependencies()) } } diff --git a/compiler/container/build.gradle.kts b/compiler/container/build.gradle.kts index 40337ab1042..5aac27b5d72 100644 --- a/compiler/container/build.gradle.kts +++ b/compiler/container/build.gradle.kts @@ -19,7 +19,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) + compileOnly(intellijCoreJar()) + testCompile(intellijCoreJar()) testRuntime(intellij { include("trove4j.jar") }) } } diff --git a/compiler/daemon/build.gradle.kts b/compiler/daemon/build.gradle.kts index 3c8ef41e332..d7e0d44ca48 100644 --- a/compiler/daemon/build.gradle.kts +++ b/compiler/daemon/build.gradle.kts @@ -19,8 +19,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellijCoreJarDependencies()) + compileOnly(intellijCoreJar()) + compileOnly(intellijCoreJarDependencies()) } } diff --git a/compiler/daemon/daemon-common/build.gradle.kts b/compiler/daemon/daemon-common/build.gradle.kts index 899f7969693..4cd23a40ed9 100644 --- a/compiler/daemon/daemon-common/build.gradle.kts +++ b/compiler/daemon/daemon-common/build.gradle.kts @@ -17,8 +17,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellijCoreJarDependencies()) + compileOnly(intellijCoreJar()) + compileOnly(intellijCoreJarDependencies()) } } diff --git a/compiler/frontend.java/build.gradle.kts b/compiler/frontend.java/build.gradle.kts index dc31a8b6b2d..b5888fdbf31 100644 --- a/compiler/frontend.java/build.gradle.kts +++ b/compiler/frontend.java/build.gradle.kts @@ -3,6 +3,10 @@ apply { plugin("kotlin") } jvmTarget = "1.6" +configureIntellijPlugin { + setExtraDependencies("intellij-core") +} + dependencies { compile(project(":core:descriptors")) compile(project(":core:descriptors.jvm")) @@ -10,6 +14,13 @@ dependencies { compile(project(":compiler:frontend")) } +afterEvaluate { + dependencies { + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("annotations.jar", "asm-all.jar", "trove4j.jar", "guava-*.jar") }) + } +} + sourceSets { "main" { projectDefault() } "test" {} diff --git a/compiler/frontend.script/build.gradle.kts b/compiler/frontend.script/build.gradle.kts index 4fc1f6b2c67..50af8c7cdbb 100644 --- a/compiler/frontend.script/build.gradle.kts +++ b/compiler/frontend.script/build.gradle.kts @@ -3,6 +3,10 @@ apply { plugin("kotlin") } jvmTarget = "1.6" +configureIntellijPlugin { + setExtraDependencies("intellij-core") +} + dependencies { compile(project(":compiler:util")) compile(project(":compiler:frontend")) @@ -11,6 +15,12 @@ dependencies { compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } } +afterEvaluate { + dependencies { + compileOnly(intellijCoreJar()) + } +} + sourceSets { "main" { projectDefault() } "test" {} diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts index d2b72edb532..1aacbd7218e 100644 --- a/compiler/frontend/build.gradle.kts +++ b/compiler/frontend/build.gradle.kts @@ -3,6 +3,10 @@ apply { plugin("kotlin") } jvmTarget = "1.6" +configureIntellijPlugin { + setExtraDependencies("intellij-core") +} + val jflexPath by configurations.creating dependencies { @@ -16,6 +20,13 @@ dependencies { jflexPath(commonDep("org.jetbrains.intellij.deps.jflex", "jflex")) } +afterEvaluate { + dependencies { + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("annotations.jar", "trove4j.jar", "guava-*.jar") }) + } +} + sourceSets { "main" { projectDefault() } "test" {} diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts index d9b28c34970..178ec34691d 100644 --- a/compiler/incremental-compilation-impl/build.gradle.kts +++ b/compiler/incremental-compilation-impl/build.gradle.kts @@ -3,6 +3,10 @@ apply { plugin("kotlin") } jvmTarget = "1.6" +configureIntellijPlugin { + setExtraDependencies("intellij-core") +} + dependencies { compile(project(":core:descriptors")) compile(project(":core:descriptors.jvm")) @@ -19,6 +23,15 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) } +afterEvaluate { + dependencies { + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("annotations.jar") }) + testCompile(intellijCoreJar()) + testCompile(intellij { include("annotations.jar") }) + } +} + sourceSets { "main" { projectDefault() } "test" { projectDefault() } diff --git a/compiler/ir/ir.psi2ir/build.gradle.kts b/compiler/ir/ir.psi2ir/build.gradle.kts index ac661bdf42e..b46646641f2 100644 --- a/compiler/ir/ir.psi2ir/build.gradle.kts +++ b/compiler/ir/ir.psi2ir/build.gradle.kts @@ -2,6 +2,10 @@ apply { plugin("kotlin") } jvmTarget = "1.6" +configureIntellijPlugin { + setExtraDependencies("intellij-core") +} + dependencies { compile(project(":compiler:util")) compile(project(":compiler:frontend")) @@ -9,6 +13,12 @@ dependencies { compile(project(":compiler:ir.tree")) } +afterEvaluate { + dependencies { + compileOnly(intellijCoreJar()) + } +} + sourceSets { "main" { projectDefault() } "test" {} diff --git a/compiler/light-classes/build.gradle.kts b/compiler/light-classes/build.gradle.kts index 20fdb692fed..35a6287f75f 100644 --- a/compiler/light-classes/build.gradle.kts +++ b/compiler/light-classes/build.gradle.kts @@ -3,6 +3,10 @@ apply { plugin("kotlin") } jvmTarget = "1.6" +configureIntellijPlugin { + setExtraDependencies("intellij-core") +} + dependencies { compile(project(":compiler:util")) compile(project(":compiler:backend")) @@ -10,6 +14,13 @@ dependencies { compile(project(":compiler:frontend.java")) } +afterEvaluate { + dependencies { + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("annotations.jar", "asm-all.jar", "trove4j.jar", "guava-*.jar") }) + } +} + sourceSets { "main" { projectDefault() } "test" {} diff --git a/compiler/plugin-api/build.gradle.kts b/compiler/plugin-api/build.gradle.kts index 8307ad2d799..1d5a309ff0a 100644 --- a/compiler/plugin-api/build.gradle.kts +++ b/compiler/plugin-api/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) + compileOnly(intellijCoreJar()) } } diff --git a/compiler/preloader/build.gradle.kts b/compiler/preloader/build.gradle.kts index 0d793efac88..98b5864bc00 100644 --- a/compiler/preloader/build.gradle.kts +++ b/compiler/preloader/build.gradle.kts @@ -9,7 +9,7 @@ configureIntellijPlugin() afterEvaluate { dependencies { - compile(intellij { include("asm-all.jar") }) + compileOnly(intellij { include("asm-all.jar") }) } } diff --git a/compiler/resolution/build.gradle.kts b/compiler/resolution/build.gradle.kts index 454a37c091a..bc207c9a037 100644 --- a/compiler/resolution/build.gradle.kts +++ b/compiler/resolution/build.gradle.kts @@ -3,11 +3,19 @@ apply { plugin("kotlin") } jvmTarget = "1.6" +configureIntellijPlugin() + dependencies { compile(project(":compiler:util")) compile(project(":core:descriptors")) } +afterEvaluate { + dependencies { + compileOnly(intellij { include("trove4j.jar") }) + } +} + sourceSets { "main" { projectDefault() } "test" {} diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 7acad876e1c..3f58b9b59b4 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { afterEvaluate { dependencies { testCompile(intellijCoreJar()) - testCompile(intellij { include("openapi.jar", "idea.jar", "idea_rt.jar") }) + testCompile(intellij { include("openapi.jar", "idea.jar", "idea_rt.jar", "guava-*.jar", "trove4j.jar", "picocontainer.jar", "asm-all.jar") }) } } diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts index ed8a9384e84..24ac024fe18 100644 --- a/compiler/tests-java8/build.gradle.kts +++ b/compiler/tests-java8/build.gradle.kts @@ -12,6 +12,13 @@ dependencies { testRuntime(projectDist(":kotlin-reflect")) } +afterEvaluate { + dependencies { + testCompileOnly(intellijCoreJar()) + testRuntime(intellij()) + } +} + sourceSets { "main" {} "test" { projectDefault() } diff --git a/compiler/util/build.gradle.kts b/compiler/util/build.gradle.kts index 30b9b10304a..a22c4015a35 100644 --- a/compiler/util/build.gradle.kts +++ b/compiler/util/build.gradle.kts @@ -14,9 +14,9 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellijCoreJarDependencies()) - compile(intellijExtra("jps-standalone") { include("jps-model.jar") }) + compileOnly(intellijCoreJar()) + compileOnly(intellijCoreJarDependencies()) + compileOnly(intellijExtra("jps-standalone") { include("jps-model.jar") }) } } diff --git a/eval4j/build.gradle.kts b/eval4j/build.gradle.kts index 62fa6e1d2f3..b9b5355a897 100644 --- a/eval4j/build.gradle.kts +++ b/eval4j/build.gradle.kts @@ -14,7 +14,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellij { include("asm-all.jar") }) + compileOnly(intellij { include("asm-all.jar") }) + testCompile(intellij { include("asm-all.jar") }) } } diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index 964bec32752..8313a9113d9 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -49,7 +49,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellijExtra("jps-build-test")) + compileOnly(intellijExtra("jps-build-test")) + testCompile(intellijExtra("jps-build-test")) testRuntime(intellij { include("idea_rt.jar") }) } } diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 0daccd69f41..b5da1690d56 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -89,14 +89,16 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellij { include("util.jar") }) + compileOnly(intellijCoreJar()) compileOnly(intellij { - include("openapi.jar", "idea.jar", "velocity.jar", "boot.jar", "gson-*.jar", - "swingx-core-*.jar", "jsr305.jar", "forms_rt.jar", "util.jar", "annotations.jar") + include("annotations.jar", "openapi.jar", "idea.jar", "velocity.jar", "boot.jar", "gson-*.jar", "log4j.jar", "asm-all.jar", + "swingx-core-*.jar", "jsr305.jar", "forms_rt.jar", "util.jar", "jdom.jar", "trove4j.jar", "guava-*.jar") }) - compile(intellijPlugins("IntelliLang", "copyright", "properties", "java-i18n")) - testCompileOnly(intellij { include("groovy-all-*.jar", "velocity.jar", "gson-*.jar", "jsr305.jar", "idea_rt.jar") }) + compileOnly(intellijPlugins("IntelliLang", "copyright", "properties", "java-i18n")) + testCompileOnly(intellijCoreJar()) + testCompile(intellijPlugins("IntelliLang", "copyright", "properties", "java-i18n")) + testCompileOnly(intellij { include("groovy-all-*.jar", "velocity.jar", "gson-*.jar", "jsr305.jar", "idea_rt.jar", "util.jar", + "log4j.jar") }) testCompileOnly(intellijPlugin("gradle") { include("gradle-base-services-*.jar", "gradle-tooling-extension-impl.jar", "gradle-wrapper-*.jar") }) testCompileOnly(intellijPlugin("Groovy") { include("Groovy.jar") }) testCompileOnly(intellijPlugin("maven") { include("maven.jar", "maven-server-api.jar") }) diff --git a/idea/formatter/build.gradle.kts b/idea/formatter/build.gradle.kts index 4ab1acfcc05..1d819ac24a2 100644 --- a/idea/formatter/build.gradle.kts +++ b/idea/formatter/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { afterEvaluate { dependencies { - compile(intellij { include("openapi.jar") }) + compileOnly(intellij { include("idea.jar", "openapi.jar", "util.jar") }) } } diff --git a/idea/ide-common/build.gradle.kts b/idea/ide-common/build.gradle.kts index 3d3b19c6f0f..f1819af559d 100644 --- a/idea/ide-common/build.gradle.kts +++ b/idea/ide-common/build.gradle.kts @@ -15,8 +15,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellij { include("annotations.jar", "guava-*.jar") }) + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("annotations.jar", "guava-*.jar") }) } } diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index dc194521fb9..621ac331d9c 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -40,12 +40,15 @@ dependencies { afterEvaluate { dependencies { - compile(intellij { include("openapi.jar", "idea.jar") }) - compile(intellijPlugin("android") { + compileOnly(intellij { include("openapi.jar", "idea.jar", "extensions.jar", "util.jar", "guava-*.jar") }) + compileOnly(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdk-common.jar", "sdklib.jar", "sdk-tools.jar", "layoutlib-api.jar") }) testCompile(intellij { include("gson-*.jar") }) testCompile(intellijPlugin("properties")) + testCompileOnly(intellijPlugin("android") { + include("android.jar", "android-common.jar", "sdk-common.jar", "sdklib.jar", "sdk-tools.jar", "layoutlib-api.jar") + }) testRuntime(intellij()) testRuntime(intellijPlugins("android", "copyright", "coverage", "gradle", "Groovy", "IntelliLang", "java-decompiler", "java-i18n", "junit", "maven", "testng")) diff --git a/idea/idea-android/idea-android-output-parser/build.gradle.kts b/idea/idea-android/idea-android-output-parser/build.gradle.kts index 06a6947c56e..a515ffb62dc 100644 --- a/idea/idea-android/idea-android-output-parser/build.gradle.kts +++ b/idea/idea-android/idea-android-output-parser/build.gradle.kts @@ -12,9 +12,10 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellijPlugin("gradle") { include("gradle-tooling-api.jar") }) - compile(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdk-common.jar") }) + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("guava-*.jar") }) + compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api.jar") }) + compileOnly(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdk-common.jar") }) } } diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts index 8f91945b58a..4220b985168 100644 --- a/idea/idea-core/build.gradle.kts +++ b/idea/idea-core/build.gradle.kts @@ -25,9 +25,9 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellij { include("util.jar", "openapi.jar", "idea.jar") }) - compile(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") }) + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("util.jar", "openapi.jar", "idea.jar", "asm-all.jar", "jdom.jar", "annotations.jar", "trove4j.jar", "guava-*.jar") }) + compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") }) } } diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 8a2b56aa01e..172afbb7003 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -32,9 +32,10 @@ dependencies { afterEvaluate { dependencies { - compileOnly(intellij { include("openapi.jar", "idea.jar", "external-system-rt.jar", "forms_rt.jar") }) + compileOnly(intellij { include("openapi.jar", "idea.jar", "external-system-rt.jar", "forms_rt.jar", "extensions.jar", "jdom.jar", "util.jar") }) compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar", "gradle-base-services-*.jar") }) compileOnly(intellijPlugin("Groovy") { include("Groovy.jar") }) + compileOnly(intellijPlugin("junit") { include("idea-junit.jar") }) testCompile(intellijPlugin("gradle") { include("gradle-wrapper-*.jar", "gradle-base-services-*.jar", "gradle-tooling-extension-impl.jar", "gradle-tooling-api-*.jar", "gradle.jar") }) testCompileOnly(intellijPlugin("Groovy") { include("Groovy.jar") }) testCompileOnly(intellij { include("groovy-all-*.jar", "idea_rt.jar") }) diff --git a/idea/idea-jps-common/build.gradle.kts b/idea/idea-jps-common/build.gradle.kts index 59749567f5f..94e4234f599 100644 --- a/idea/idea-jps-common/build.gradle.kts +++ b/idea/idea-jps-common/build.gradle.kts @@ -15,8 +15,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellij { include("util.jar") }) + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("jdom.jar", "util.jar") }) } } diff --git a/idea/idea-jvm/build.gradle.kts b/idea/idea-jvm/build.gradle.kts index af31b6807e1..ac67d5e8150 100644 --- a/idea/idea-jvm/build.gradle.kts +++ b/idea/idea-jvm/build.gradle.kts @@ -13,12 +13,12 @@ dependencies { afterEvaluate { dependencies { - compileOnly(intellij { include("openapi.jar", "idea.jar") }) + compileOnly(intellij { include("openapi.jar", "idea.jar", "extensions.jar", "util.jar") }) - compile(intellijPlugin("junit") { include("idea-junit.jar") }) - compile(intellijPlugin("testng") { include("testng.jar", "testng-plugin.jar") }) - compile(intellijPlugin("coverage") { include("coverage.jar") }) - compile(intellijPlugin("java-decompiler") { include("java-decompiler.jar") }) + compileOnly(intellijPlugin("junit") { include("idea-junit.jar") }) + compileOnly(intellijPlugin("testng") { include("testng.jar", "testng-plugin.jar") }) + compileOnly(intellijPlugin("coverage") { include("coverage.jar") }) + compileOnly(intellijPlugin("java-decompiler") { include("java-decompiler.jar") }) } } diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index 472af2fb3db..f07983de997 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { afterEvaluate { dependencies { - compileOnly(intellij { include("openapi.jar", "idea.jar", "gson-*.jar") }) + compileOnly(intellij { include("openapi.jar", "idea.jar", "gson-*.jar", "jdom.jar", "extensions.jar", "util.jar") }) compileOnly(intellijPlugin("maven") { include("maven.jar", "maven-server-api.jar") }) testCompileOnly(intellij { include("openapi.jar", "idea.jar", "gson-*.jar", "idea_rt.jar") }) testCompileOnly(intellijPlugin("maven") { include("maven.jar", "maven-server-api.jar") }) diff --git a/idea/idea-test-framework/build.gradle.kts b/idea/idea-test-framework/build.gradle.kts index e133a411d2e..1863000e42e 100644 --- a/idea/idea-test-framework/build.gradle.kts +++ b/idea/idea-test-framework/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { afterEvaluate { dependencies { - compile(intellij { include("openapi.jar", "idea.jar") }) + compileOnly(intellij { include("openapi.jar", "idea.jar", "log4j.jar") }) } } diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index 395a45a62c7..755bcfe137f 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -19,6 +19,7 @@ val usedIntellijPlugins = arrayOf( configureIntellijPlugin { setPlugins(*usedIntellijPlugins) + setExtraDependencies("intellij-core") } dependencies { @@ -43,6 +44,7 @@ dependencies { afterEvaluate { dependencies { + compileOnly(intellijCoreJar()) testRuntime(intellij()) testRuntime(intellijPlugins(*usedIntellijPlugins)) } diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts index 749c436150e..2dd0c406389 100644 --- a/jps-plugin/build.gradle.kts +++ b/jps-plugin/build.gradle.kts @@ -31,9 +31,10 @@ dependencies { afterEvaluate { dependencies { + compileOnly(intellij { include("jdom.jar", "trove4j.jar", "jps-model.jar", "openapi.jar", "util.jar") }) compileOnly(intellijExtra("jps-standalone") { include("jps-builders.jar", "jps-builders-6.jar") }) testCompileOnly(intellijExtra("jps-standalone") { include("jps-builders.jar", "jps-builders-6.jar") }) - testCompile(intellij { include("openapi.jar", "idea.jar") }) + testCompileOnly(intellij { include("openapi.jar", "idea.jar", "log4j.jar") }) testCompile(intellijExtra("jps-build-test")) testRuntime(intellij()) testRuntime(intellijCoreJar()) diff --git a/js/js.ast/build.gradle.kts b/js/js.ast/build.gradle.kts index 0e0ff5e822e..a6d707f37ae 100644 --- a/js/js.ast/build.gradle.kts +++ b/js/js.ast/build.gradle.kts @@ -14,12 +14,11 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellij { include("trove6j.jar")} ) + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("trove4j.jar")} ) } } - sourceSets { "main" { projectDefault() } "test" {} diff --git a/js/js.dce/build.gradle.kts b/js/js.dce/build.gradle.kts index beccdabdbb6..ba315d930c4 100644 --- a/js/js.dce/build.gradle.kts +++ b/js/js.dce/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) + compileOnly(intellijCoreJar()) } } diff --git a/js/js.frontend/build.gradle.kts b/js/js.frontend/build.gradle.kts index 083eca7938a..49a9d778e99 100644 --- a/js/js.frontend/build.gradle.kts +++ b/js/js.frontend/build.gradle.kts @@ -17,7 +17,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("guava-*.jar")} ) } } diff --git a/js/js.parser/build.gradle.kts b/js/js.parser/build.gradle.kts index 35430726ba4..d07bfb450ee 100644 --- a/js/js.parser/build.gradle.kts +++ b/js/js.parser/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) + compileOnly(intellijCoreJar()) } } diff --git a/js/js.serializer/build.gradle.kts b/js/js.serializer/build.gradle.kts index 3b9fb228fcc..b4d961529fb 100644 --- a/js/js.serializer/build.gradle.kts +++ b/js/js.serializer/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) + compileOnly(intellijCoreJar()) } } diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index e8fe203a143..d07806386bc 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -12,7 +12,9 @@ node { apply { plugin("kotlin") } -configureIntellijPlugin() +configureIntellijPlugin { + setExtraDependencies("intellij-core") +} val antLauncherJar by configurations.creating @@ -42,7 +44,9 @@ dependencies { afterEvaluate { dependencies { - testCompile(intellij { include("openapi.jar", "idea.jar", "idea_rt.jar") }) + testCompileOnly(intellijCoreJar()) + testCompileOnly(intellij { include("openapi.jar", "idea.jar", "idea_rt.jar", "util.jar") }) + testRuntime(intellij()) } } diff --git a/js/js.translator/build.gradle.kts b/js/js.translator/build.gradle.kts index 7297938335f..f07d0b2b9e5 100644 --- a/js/js.translator/build.gradle.kts +++ b/js/js.translator/build.gradle.kts @@ -24,7 +24,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("trove4j.jar", "guava-*.jar")} ) } } diff --git a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle index 3b850784411..4d3d41a540f 100644 --- a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle +++ b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle @@ -1,3 +1,8 @@ + +plugins { + id 'org.jetbrains.intellij' +} + apply plugin: 'kotlin' apply plugin: 'maven' @@ -6,6 +11,13 @@ repositories { jcenter() } +intellij { + version = rootProject.ext["versions.intellij"] + instrumentCode = false + configureDefaultDependencies = false + extraDependencies = ['intellij-core'] +} + dependencies { compile project(':kotlin-gradle-plugin-api') // Use this dependency instead when building apart from the other modules: @@ -20,4 +32,10 @@ dependencies { compileOnly project(':compiler:cli') compileOnly gradleApi() +} + +afterEvaluate { + dependencies { + compileOnly intellijExtra('intellij-core') + } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle b/libraries/tools/kotlin-gradle-plugin/build.gradle index a3d8d9ad25d..0506f37b0be 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle @@ -13,6 +13,10 @@ buildscript { } } +plugins { + id 'org.jetbrains.intellij' +} + configureJvmProject(project) configurePublishing(project) @@ -22,6 +26,13 @@ repositories { maven { url 'https://maven.google.com' } } +intellij { + version = rootProject.ext["versions.intellij"] + instrumentCode = false + configureDefaultDependencies = false + extraDependencies = ['intellij-core'] +} + configurations { agp25CompileOnly } @@ -65,6 +76,12 @@ dependencies { testCompileOnly project(':kotlin-annotation-processing-gradle') } +afterEvaluate { + dependencies { + compileOnly intellijExtra('intellij-core') + } +} + tasks.withType(project.compileKotlin.class) { kotlinOptions.jdkHome = JDK_18 } diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index 6483fa27e44..2d546c1c9a0 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -3,6 +3,8 @@ description = "Kotlin scripting support utilities" apply { plugin("kotlin") } +configureIntellijPlugin() + dependencies { compile(project(":kotlin-stdlib")) compile(project(":kotlin-script-runtime")) @@ -22,6 +24,13 @@ dependencies { testRuntime("org.apache.maven:maven-core:3.0.3") } +afterEvaluate { + dependencies { + compileOnly(intellij { include("openapi.jar", "util.jar") }) + testCompile(intellij { include("openapi.jar", "util.jar") }) + } +} + projectTest() runtimeJar() diff --git a/plugins/allopen/allopen-ide/build.gradle.kts b/plugins/allopen/allopen-ide/build.gradle.kts index fbd444fa3de..4e94e1b275a 100644 --- a/plugins/allopen/allopen-ide/build.gradle.kts +++ b/plugins/allopen/allopen-ide/build.gradle.kts @@ -21,9 +21,9 @@ dependencies { afterEvaluate { dependencies { - compile(intellij { include("openapi.jar", "idea.jar") }) - compile(intellijPlugin("maven") { include("maven.jar") }) - compile(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") }) + compileOnly(intellij { include("openapi.jar", "idea.jar") }) + compileOnly(intellijPlugin("maven") { include("maven.jar") }) + compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") }) } } diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts index 15e2a62c2d7..673575811f7 100644 --- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts @@ -28,7 +28,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("asm-all.jar") }) } } diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index 3b6519e0f55..f87bfaede3a 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -40,8 +40,12 @@ dependencies { afterEvaluate { dependencies { - compile(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdk-common.jar", "sdk-tools.jar") }) - compile(intellijPlugin("Groovy") { include("Groovy.jar") }) + compileOnly(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdk-common.jar", "sdk-tools.jar") }) + compileOnly(intellijPlugin("Groovy") { include("Groovy.jar") }) + compileOnly(intellij { include("extensions.jar", "openapi.jar", "util.jar", "idea.jar")} ) + testCompile(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdk-common.jar", "sdk-tools.jar") }) + testCompile(intellijPlugin("Groovy") { include("Groovy.jar") }) + testCompile(intellij { include("extensions.jar")} ) testRuntime(intellij()) testRuntime(intellijPlugins("junit", "IntelliLang", "testng", "copyright", "properties", "java-i18n", "gradle", "Groovy", "coverage", "java-decompiler", "maven", "android")) diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts b/plugins/android-extensions/android-extensions-jps/build.gradle.kts index 1d4de9c82f3..e57990037b8 100644 --- a/plugins/android-extensions/android-extensions-jps/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts @@ -20,6 +20,7 @@ dependencies { afterEvaluate { dependencies { + compileOnly(intellij { include("openapi.jar", "jps-builders.jar") }) compile(intellijPlugin("android") { include("**/android-jps-plugin.jar") }) testCompileOnly(intellijExtra("jps-build-test") { include("jps-build-test.jar") } ) testRuntime(intellijPlugin("android")) diff --git a/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts b/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts index 6db767cb9bb..4b6f961b8a1 100644 --- a/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts +++ b/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts @@ -21,7 +21,7 @@ afterEvaluate { dependencies { compileOnly(intellijPlugin("maven") { include("maven.jar", "maven-server-api.jar") }) compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") }) - compileOnly(intellij { include("openapi.jar", "idea.jar") }) + compileOnly(intellij { include("openapi.jar", "idea.jar", "extensions.jar", "jdom.jar", "util.jar") }) } } diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index cece19822af..af95613ccd7 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts @@ -3,7 +3,9 @@ description = "Annotation Processor for Kotlin" apply { plugin("kotlin") } -configureIntellijPlugin() +configureIntellijPlugin { + setExtraDependencies("intellij-core") +} dependencies { compile(project(":compiler:util")) @@ -24,6 +26,9 @@ dependencies { afterEvaluate { dependencies { + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("asm-all.jar") }) + testCompile(intellijCoreJar()) testCompile(intellij { include("idea.jar", "idea_rt.jar", "openapi.jar") }) } } diff --git a/plugins/kapt3/kapt3-idea/build.gradle.kts b/plugins/kapt3/kapt3-idea/build.gradle.kts index 70d4cbb3ccf..135098b7743 100644 --- a/plugins/kapt3/kapt3-idea/build.gradle.kts +++ b/plugins/kapt3/kapt3-idea/build.gradle.kts @@ -17,9 +17,9 @@ dependencies { afterEvaluate { dependencies { - compile(intellij { include("openapi.jar", "external-system-rt.jar") }) - compile(intellijPlugin("gradle") { include("gradle-core-*.jar", "gradle-tooling-api-*.jar", "gradle.jar") }) - compile(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdklib.jar", "sdk-common.jar", "sdk-tools.jar") }) + compileOnly(intellij { include("openapi.jar", "external-system-rt.jar", "util.jar") }) + compileOnly(intellijPlugin("gradle") { include("gradle-core-*.jar", "gradle-tooling-api-*.jar", "gradle.jar") }) + compileOnly(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdklib.jar", "sdk-common.jar", "sdk-tools.jar") }) } } diff --git a/plugins/lint/build.gradle.kts b/plugins/lint/build.gradle.kts index c0203d9e268..9975fba0ab4 100644 --- a/plugins/lint/build.gradle.kts +++ b/plugins/lint/build.gradle.kts @@ -19,11 +19,11 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellij { include("util.jar", "guava-*.jar") }) - compile(intellijPlugin("android") { + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("util.jar", "guava-*.jar", "openapi.jar", "idea.jar", "asm-all.jar") }) + compileOnly(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdklib.jar", "sdk-common.jar", "sdk-tools.jar", - "repository.jar", "lombok-ast-*.jar") + "repository.jar", "lombok-ast-*.jar", "layoutlib-api.jar", "kxml2-*.jar") }) } } diff --git a/plugins/noarg/noarg-cli/build.gradle.kts b/plugins/noarg/noarg-cli/build.gradle.kts index 7dcfe4c0529..2df8b08e629 100644 --- a/plugins/noarg/noarg-cli/build.gradle.kts +++ b/plugins/noarg/noarg-cli/build.gradle.kts @@ -3,6 +3,10 @@ description = "Kotlin NoArg Compiler Plugin" apply { plugin("kotlin") } +configureIntellijPlugin { + setExtraDependencies("intellij-core") +} + dependencies { compileOnly(project(":compiler:frontend")) compileOnly(project(":compiler:frontend.java")) @@ -21,6 +25,13 @@ dependencies { testRuntime(ideaSdkDeps("*.jar")) } +afterEvaluate { + dependencies { + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("asm-all.jar") }) + } +} + sourceSets { "main" { projectDefault() } "test" { projectDefault() } diff --git a/plugins/noarg/noarg-ide/build.gradle.kts b/plugins/noarg/noarg-ide/build.gradle.kts index 8f0b2be00c2..5606b11f456 100644 --- a/plugins/noarg/noarg-ide/build.gradle.kts +++ b/plugins/noarg/noarg-ide/build.gradle.kts @@ -23,9 +23,9 @@ dependencies { afterEvaluate { dependencies { - compile(intellij { include("openapi.jar", "idea.jar") }) - compile(intellijPlugin("maven") { include("maven.jar") }) - compile(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") }) + compileOnly(intellij { include("openapi.jar", "idea.jar") }) + compileOnly(intellijPlugin("maven") { include("maven.jar") }) + compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") }) } } diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts index 670326caa8f..f959829af24 100644 --- a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts +++ b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts @@ -3,6 +3,10 @@ description = "Kotlin SamWithReceiver Compiler Plugin" apply { plugin("kotlin") } +configureIntellijPlugin { + setExtraDependencies("intellij-core") +} + dependencies { compileOnly(project(":compiler:frontend")) compileOnly(project(":compiler:frontend.java")) @@ -19,6 +23,12 @@ dependencies { testRuntime(ideaSdkDeps("*.jar")) } +afterEvaluate { + dependencies { + compileOnly(intellijCoreJar()) + } +} + sourceSets { "main" { projectDefault() } "test" { projectDefault() } diff --git a/plugins/source-sections/source-sections-compiler/build.gradle.kts b/plugins/source-sections/source-sections-compiler/build.gradle.kts index b8664e58428..9e75e67a3e9 100644 --- a/plugins/source-sections/source-sections-compiler/build.gradle.kts +++ b/plugins/source-sections/source-sections-compiler/build.gradle.kts @@ -3,7 +3,10 @@ description = "Kotlin SourceSections Compiler Plugin" apply { plugin("kotlin") } -configureIntellijPlugin() +configureIntellijPlugin { + setExtraDependencies("intellij-core") +} + dependencies { compileOnly(project(":compiler:frontend")) @@ -25,6 +28,8 @@ dependencies { afterEvaluate { dependencies { + compileOnly(intellijCoreJar()) + testCompile(intellijCoreJar()) testCompile(intellij { include("idea.jar", "idea_rt.jar", "openapi.jar") }) } } diff --git a/plugins/uast-kotlin-idea/build.gradle.kts b/plugins/uast-kotlin-idea/build.gradle.kts index 6dd212a35c7..0f90c4760bc 100644 --- a/plugins/uast-kotlin-idea/build.gradle.kts +++ b/plugins/uast-kotlin-idea/build.gradle.kts @@ -1,6 +1,8 @@ apply { plugin("kotlin") } +configureIntellijPlugin() + dependencies { compile(projectDist(":kotlin-stdlib")) compile(project(":core:util.runtime")) @@ -10,6 +12,12 @@ dependencies { compile(project(":plugins:uast-kotlin")) } +afterEvaluate { + dependencies { + compileOnly(intellij { include("openapi.jar", "util.jar") }) + } +} + sourceSets { "main" { projectDefault() } "test" {} diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index 777a2917b70..7a30c546776 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -32,12 +32,13 @@ dependencies { afterEvaluate { dependencies { - compileOnly(intellij { include("openapi.jar", "idea.jar") }) + compileOnly(intellij { include("openapi.jar", "idea.jar", "util.jar", "extensions.jar", "asm-all.jar") }) + compileOnly(intellijPlugins("junit", "gradle", "Groovy", "android", + "maven", // TODO: check whether it works in AS (it was marked optional before + "properties")) testCompileOnly(intellij { include("idea_rt.jar") }) + testCompile(intellijPlugins("junit", "gradle", "Groovy", "android", "maven", "properties")) testRuntime(intellij()) - compile(intellijPlugins("junit", "gradle", "Groovy", "android", - "maven", // TODO: check whether it works in AS (it was marked optional before - "properties")) } } diff --git a/test-instrumenter/build.gradle.kts b/test-instrumenter/build.gradle.kts index 99667df11c0..ffec95d5df0 100644 --- a/test-instrumenter/build.gradle.kts +++ b/test-instrumenter/build.gradle.kts @@ -13,8 +13,8 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellij { include("asm-all.jar") }) + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("asm-all.jar") }) } } diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index a41f26b4b0f..9b1780217ee 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -101,26 +101,40 @@ dependencies { afterEvaluate { dependencies { - compile(intellijCoreJar()) - compile(intellij { include("annotations.jar", "trove4j.jar", "openapi.jar", "idea.jar", "util.jar", "jdom.jar") }) - compile(intellijPlugin("CSS")) - compile(intellijPlugin("DatabaseTools")) - compile(intellijPlugin("JavaEE")) - compile(intellijPlugin("jsp")) - compile(intellijPlugin("PersistenceSupport")) - compile(intellijPlugin("Spring")) - compile(intellijPlugin("properties")) - compile(intellijPlugin("java-i18n")) - compile(intellijPlugin("gradle")) - compile(intellijPlugin("Groovy")) - compile(intellijPlugin("junit")) - compile(intellijPlugin("uml")) - compile(intellijPlugin("JavaScriptLanguage")) - compile(intellijPlugin("JavaScriptDebugger")) - compile(intellijPlugin("NodeJS")) - testCompile(intellij { include("gson-*.jar") }) + compileOnly(intellijCoreJar()) + compileOnly(intellij { include("annotations.jar", "trove4j.jar", "openapi.jar", "idea.jar", "util.jar", "jdom.jar") }) + compileOnly(intellijPlugin("CSS")) + compileOnly(intellijPlugin("DatabaseTools")) + compileOnly(intellijPlugin("JavaEE")) + compileOnly(intellijPlugin("jsp")) + compileOnly(intellijPlugin("PersistenceSupport")) + compileOnly(intellijPlugin("Spring")) + compileOnly(intellijPlugin("properties")) + compileOnly(intellijPlugin("java-i18n")) + compileOnly(intellijPlugin("gradle")) + compileOnly(intellijPlugin("Groovy")) + compileOnly(intellijPlugin("junit")) + compileOnly(intellijPlugin("uml")) + compileOnly(intellijPlugin("JavaScriptLanguage")) + compileOnly(intellijPlugin("JavaScriptDebugger")) + compileOnly(intellijPlugin("NodeJS")) + testCompileOnly(intellij { include("gson-*.jar", "annotations.jar", "trove4j.jar", "openapi.jar", "idea.jar", "util.jar", "jdom.jar") }) testRuntime(intellij()) - testRuntime(intellijPlugin("properties")) + testCompile(intellijPlugin("CSS")) + testCompile(intellijPlugin("DatabaseTools")) + testCompile(intellijPlugin("JavaEE")) + testCompile(intellijPlugin("jsp")) + testCompile(intellijPlugin("PersistenceSupport")) + testCompile(intellijPlugin("Spring")) + testCompile(intellijPlugin("properties")) + testCompile(intellijPlugin("java-i18n")) + testCompile(intellijPlugin("gradle")) + testCompile(intellijPlugin("Groovy")) + testCompile(intellijPlugin("junit")) + testCompile(intellijPlugin("uml")) + testCompile(intellijPlugin("JavaScriptLanguage")) + testCompile(intellijPlugin("JavaScriptDebugger")) + testCompile(intellijPlugin("NodeJS")) testRuntime(intellijPlugin("coverage")) testRuntime(intellijPlugin("maven")) testRuntime(intellijPlugin("android"))