From 0f2fb4ff82c08bdd7e798b2e551fbd317b9daea8 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Wed, 23 Jan 2019 14:45:25 +0300 Subject: [PATCH] Build: remove intellijCore/annotations.jar usages --- build-common/build.gradle.kts | 2 +- build.gradle.kts | 3 +-- compiler/backend/build.gradle.kts | 2 +- compiler/compiler.pro | 4 ++++ compiler/compiler.pro.181 | 4 ++++ compiler/compiler.pro.191 | 4 ++++ compiler/compiler.pro.as32 | 4 ++++ compiler/compiler.pro.as34 | 4 ++++ compiler/fir/cones/build.gradle.kts | 2 +- compiler/fir/java/build.gradle.kts | 2 +- compiler/fir/psi2fir/build.gradle.kts | 2 +- compiler/fir/resolve/build.gradle.kts | 2 +- compiler/fir/tree/build.gradle.kts | 2 +- compiler/fir/tree/visitors-generator/build.gradle.kts | 2 +- compiler/frontend.common/build.gradle.kts | 2 +- compiler/frontend.java/build.gradle.kts | 2 +- compiler/frontend/build.gradle.kts | 2 +- compiler/incremental-compilation-impl/build.gradle.kts | 3 +-- compiler/ir/backend.jvm/build.gradle.kts | 2 +- compiler/light-classes/build.gradle.kts | 2 +- compiler/psi/build.gradle.kts | 2 +- compiler/tests-common/build.gradle.kts | 2 +- idea/fir-view/build.gradle.kts | 4 ++-- idea/ide-common/build.gradle.kts | 2 +- idea/idea-core/build.gradle.kts | 2 +- js/js.ast/build.gradle.kts | 2 +- js/js.dce/build.gradle.kts | 2 +- js/js.frontend/build.gradle.kts | 2 +- js/js.parser/build.gradle.kts | 2 +- js/js.serializer/build.gradle.kts | 2 +- js/js.tests/build.gradle.kts | 2 +- js/js.translator/build.gradle.kts | 2 +- ultimate/build.gradle.kts | 4 ++-- 33 files changed, 50 insertions(+), 32 deletions(-) diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index fb25f5cc397..98ad4c404a9 100644 --- a/build-common/build.gradle.kts +++ b/build-common/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { compileOnly(project(":js:js.serializer")) compileOnly(project(":js:js.frontend")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "util", rootProject = rootProject) } + compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "util", rootProject = rootProject) } compileOnly(project(":kotlin-reflect-api")) testCompileOnly(project(":compiler:cli-common")) diff --git a/build.gradle.kts b/build.gradle.kts index 194c5866efb..44ad2961f24 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -186,8 +186,7 @@ extra["intellijUltimateEnabled"] = intellijUltimateEnabled extra["intellijSeparateSdks"] = intellijSeparateSdks extra["IntellijCoreDependencies"] = - listOf("annotations", - if (Platform[191].orHigher()) "asm-all-7.0" else "asm-all", + listOf(if (Platform[191].orHigher()) "asm-all-7.0" else "asm-all", "guava", "jdom", "jna", diff --git a/compiler/backend/build.gradle.kts b/compiler/backend/build.gradle.kts index 98d4f3698d0..87f0a9478c5 100644 --- a/compiler/backend/build.gradle.kts +++ b/compiler/backend/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compile(project(":compiler:serialization")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations", "asm-all", rootProject = rootProject) } + compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) } } sourceSets { diff --git a/compiler/compiler.pro b/compiler/compiler.pro index 10a361df54a..4ae1f210c35 100644 --- a/compiler/compiler.pro +++ b/compiler/compiler.pro @@ -52,6 +52,10 @@ messages/**) -dontwarn com.intellij.util.io.TarUtil -dontwarn com.intellij.util.io.Compressor$Tar +# Annotations from intellijCore/annotations.jar that not presented in org.jetbrains.annotations +-dontwarn org.jetbrains.annotations.Async* +-dontwarn org.jetbrains.annotations.Nls$Capitalization + # Nullability annotations used in Guava -dontwarn org.checkerframework.checker.nullness.compatqual.NullableDecl -dontwarn org.checkerframework.checker.nullness.compatqual.MonotonicNonNullDecl diff --git a/compiler/compiler.pro.181 b/compiler/compiler.pro.181 index 19069f10d5a..7a109115e96 100644 --- a/compiler/compiler.pro.181 +++ b/compiler/compiler.pro.181 @@ -51,6 +51,10 @@ messages/**) -dontwarn org.jetbrains.annotations.Mutable -dontwarn com.intellij.util.io.TarUtil +# Annotations from intellijCore/annotations.jar that not presented in org.jetbrains.annotations +-dontwarn org.jetbrains.annotations.Async* +-dontwarn org.jetbrains.annotations.Nls$Capitalization + # Depends on apache batik which has lots of dependencies -dontwarn com.intellij.util.SVGLoader* diff --git a/compiler/compiler.pro.191 b/compiler/compiler.pro.191 index 01c7dce27f9..02131f66d7b 100644 --- a/compiler/compiler.pro.191 +++ b/compiler/compiler.pro.191 @@ -53,6 +53,10 @@ messages/**) -dontwarn com.intellij.util.io.TarUtil -dontwarn com.intellij.util.io.Compressor$Tar +# Annotations from intellijCore/annotations.jar that not presented in org.jetbrains.annotations +-dontwarn org.jetbrains.annotations.Async* +-dontwarn org.jetbrains.annotations.Nls$Capitalization + # Nullability annotations used in Guava -dontwarn org.checkerframework.checker.nullness.compatqual.NullableDecl -dontwarn org.checkerframework.checker.nullness.compatqual.MonotonicNonNullDecl diff --git a/compiler/compiler.pro.as32 b/compiler/compiler.pro.as32 index c2a1f7a55c9..1fbc1318b98 100644 --- a/compiler/compiler.pro.as32 +++ b/compiler/compiler.pro.as32 @@ -52,6 +52,10 @@ messages/**) -dontwarn org.jetbrains.annotations.Mutable -dontwarn com.intellij.util.io.TarUtil +# Annotations from intellijCore/annotations.jar that not presented in org.jetbrains.annotations +-dontwarn org.jetbrains.annotations.Async* +-dontwarn org.jetbrains.annotations.Nls$Capitalization + # Depends on apache batick which has lots of dependencies -dontwarn com.intellij.util.SVGLoader* diff --git a/compiler/compiler.pro.as34 b/compiler/compiler.pro.as34 index 01c7dce27f9..02131f66d7b 100644 --- a/compiler/compiler.pro.as34 +++ b/compiler/compiler.pro.as34 @@ -53,6 +53,10 @@ messages/**) -dontwarn com.intellij.util.io.TarUtil -dontwarn com.intellij.util.io.Compressor$Tar +# Annotations from intellijCore/annotations.jar that not presented in org.jetbrains.annotations +-dontwarn org.jetbrains.annotations.Async* +-dontwarn org.jetbrains.annotations.Nls$Capitalization + # Nullability annotations used in Guava -dontwarn org.checkerframework.checker.nullness.compatqual.NullableDecl -dontwarn org.checkerframework.checker.nullness.compatqual.MonotonicNonNullDecl diff --git a/compiler/fir/cones/build.gradle.kts b/compiler/fir/cones/build.gradle.kts index a208a014b85..34f217b94f5 100644 --- a/compiler/fir/cones/build.gradle.kts +++ b/compiler/fir/cones/build.gradle.kts @@ -13,7 +13,7 @@ jvmTarget = "1.6" dependencies { compile(project(":core:descriptors")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/compiler/fir/java/build.gradle.kts b/compiler/fir/java/build.gradle.kts index e4331785db1..1c2c652f18d 100644 --- a/compiler/fir/java/build.gradle.kts +++ b/compiler/fir/java/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { compile(project(":compiler:frontend.java")) compile(project(":compiler:fir:resolve")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/fir/psi2fir/build.gradle.kts b/compiler/fir/psi2fir/build.gradle.kts index 4ad50f28fb1..2cd09e80a38 100644 --- a/compiler/fir/psi2fir/build.gradle.kts +++ b/compiler/fir/psi2fir/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { compile(project(":compiler:fir:tree")) compile(project(":compiler:ir.tree")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } testRuntime(intellijDep()) diff --git a/compiler/fir/resolve/build.gradle.kts b/compiler/fir/resolve/build.gradle.kts index 4152af1c0e5..b096f208205 100644 --- a/compiler/fir/resolve/build.gradle.kts +++ b/compiler/fir/resolve/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { compile(project(":compiler:fir:cones")) compile(project(":compiler:fir:tree")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util", "asm-all", rootProject = rootProject) } diff --git a/compiler/fir/tree/build.gradle.kts b/compiler/fir/tree/build.gradle.kts index 4a99668fffd..3d225d17bef 100644 --- a/compiler/fir/tree/build.gradle.kts +++ b/compiler/fir/tree/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { compile(project(":compiler:fir:cones")) compile(project(":compiler:ir.tree")) // Necessary only to store bound PsiElement inside FirElement - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/compiler/fir/tree/visitors-generator/build.gradle.kts b/compiler/fir/tree/visitors-generator/build.gradle.kts index 616e18b370a..f75da005dc9 100644 --- a/compiler/fir/tree/visitors-generator/build.gradle.kts +++ b/compiler/fir/tree/visitors-generator/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { compile(intellijCoreDep()) { includeJars("intellij-core") } compile(intellijDep()) { - includeJars("trove4j", "picocontainer", "annotations", rootProject = rootProject) + includeJars("trove4j", "picocontainer", rootProject = rootProject) isTransitive = false } compile(intellijDep()) { includeJars("guava", rootProject = rootProject) } diff --git a/compiler/frontend.common/build.gradle.kts b/compiler/frontend.common/build.gradle.kts index 37a4fde6077..e32e1755f79 100644 --- a/compiler/frontend.common/build.gradle.kts +++ b/compiler/frontend.common/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { compile(project(":compiler:psi")) compile(project(":compiler:container")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/frontend.java/build.gradle.kts b/compiler/frontend.java/build.gradle.kts index abdb8394049..f996763b877 100644 --- a/compiler/frontend.java/build.gradle.kts +++ b/compiler/frontend.java/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { } compile(project(":compiler:frontend")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava", rootProject = rootProject) } + compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) } } sourceSets { diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts index 44628fe3457..54c5c92daa0 100644 --- a/compiler/frontend/build.gradle.kts +++ b/compiler/frontend/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { compile(project(":kotlin-script-runtime")) compile(commonDep("io.javaslang","javaslang")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - compileOnly(intellijDep()) { includeJars("annotations", "trove4j", "guava", rootProject = rootProject) } + compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) } } sourceSets { diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts index f9a2dcec419..f70b4821686 100644 --- a/compiler/incremental-compilation-impl/build.gradle.kts +++ b/compiler/incremental-compilation-impl/build.gradle.kts @@ -17,7 +17,6 @@ dependencies { compile(project(":kotlin-build-common")) compile(project(":compiler:daemon-common")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - compileOnly(intellijDep()) { includeJars("annotations") } testCompile(commonDep("junit:junit")) testCompile(project(":kotlin-test:kotlin-test-junit")) @@ -26,7 +25,7 @@ dependencies { testCompile(projectTests(":kotlin-build-common")) testCompile(projectTests(":compiler:tests-common")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } - testCompile(intellijDep()) { includeJars("annotations", "log4j", "jdom") } + testCompile(intellijDep()) { includeJars("log4j", "jdom") } } sourceSets { diff --git a/compiler/ir/backend.jvm/build.gradle.kts b/compiler/ir/backend.jvm/build.gradle.kts index 0a7394c7f83..1d5be45f0a0 100644 --- a/compiler/ir/backend.jvm/build.gradle.kts +++ b/compiler/ir/backend.jvm/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { compile(project(":compiler:ir.tree")) compile(project(":compiler:ir.psi2ir")) compile(project(":compiler:ir.backend.common")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations", "asm-all", rootProject = rootProject) } + compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) } } sourceSets { diff --git a/compiler/light-classes/build.gradle.kts b/compiler/light-classes/build.gradle.kts index 5f931fe8869..c24a98d12f5 100644 --- a/compiler/light-classes/build.gradle.kts +++ b/compiler/light-classes/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava", rootProject = rootProject) } + compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "guava", rootProject = rootProject) } } sourceSets { diff --git a/compiler/psi/build.gradle.kts b/compiler/psi/build.gradle.kts index 568a29bc83c..0be685b8878 100644 --- a/compiler/psi/build.gradle.kts +++ b/compiler/psi/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { compile(project(":compiler:util")) compile(project(":kotlin-script-runtime")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("guava", "trove4j", rootProject = rootProject) } jflexPath(commonDep("org.jetbrains.intellij.deps.jflex", "jflex")) diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 33fd01d9469..5e07b513b1c 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -36,7 +36,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", "annotations", rootProject = rootProject) + includeJars("openapi", "platform-api", "platform-impl", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "bootstrap", rootProject = rootProject) isTransitive = false } } diff --git a/idea/fir-view/build.gradle.kts b/idea/fir-view/build.gradle.kts index 7eff16aa403..410174a2672 100644 --- a/idea/fir-view/build.gradle.kts +++ b/idea/fir-view/build.gradle.kts @@ -20,8 +20,8 @@ dependencies { compile(project(":idea:idea-core")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } - compileOnly(intellijDep()) { includeJars("util", "openapi", "idea", "asm-all", "jdom", "annotations", "trove4j", "guava", rootProject = rootProject) } + 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) } } diff --git a/idea/ide-common/build.gradle.kts b/idea/ide-common/build.gradle.kts index 58417128644..888dcbf88bc 100644 --- a/idea/ide-common/build.gradle.kts +++ b/idea/ide-common/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { compile(project(":compiler:frontend.java")) compile(project(":js:js.frontend")) compile(project(":js:js.serializer")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) } diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts index 403cde5a8a9..cbd95d2e68f 100644 --- a/idea/idea-core/build.gradle.kts +++ b/idea/idea-core/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { compile(project(":kotlin-scripting-compiler")) 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", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { Ide.IJ191.orHigher { this@compileOnly.includeJars("platform-api") diff --git a/js/js.ast/build.gradle.kts b/js/js.ast/build.gradle.kts index d35ad3bffea..64679287fe2 100644 --- a/js/js.ast/build.gradle.kts +++ b/js/js.ast/build.gradle.kts @@ -9,7 +9,7 @@ jvmTarget = "1.6" dependencies { compile(project(":compiler:util")) compile(project(":compiler:frontend")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("trove4j") } } diff --git a/js/js.dce/build.gradle.kts b/js/js.dce/build.gradle.kts index 14acb03c152..bd20caedd3e 100644 --- a/js/js.dce/build.gradle.kts +++ b/js/js.dce/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { compile(project(":compiler:util")) compile(project(":js:js.ast")) compile(project(":js:js.translator")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/js/js.frontend/build.gradle.kts b/js/js.frontend/build.gradle.kts index 46c705338e1..f24c2acd488 100644 --- a/js/js.frontend/build.gradle.kts +++ b/js/js.frontend/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { compile(project(":js:js.ast")) compile(project(":js:js.parser")) compile(project(":js:js.serializer")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) } } diff --git a/js/js.parser/build.gradle.kts b/js/js.parser/build.gradle.kts index 9997bb7a16c..14884a562ac 100644 --- a/js/js.parser/build.gradle.kts +++ b/js/js.parser/build.gradle.kts @@ -7,7 +7,7 @@ plugins { dependencies { compile(project(":compiler:util")) compile(project(":js:js.ast")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/js/js.serializer/build.gradle.kts b/js/js.serializer/build.gradle.kts index 59bafe55053..368d7e00ef8 100644 --- a/js/js.serializer/build.gradle.kts +++ b/js/js.serializer/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:serialization")) compile(project(":js:js.ast")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 48712c4c64b..5836a65c5fd 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { testCompileOnly(project(":compiler:frontend")) testCompileOnly(project(":compiler:cli")) testCompileOnly(project(":compiler:util")) - testCompileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util") } testCompile(project(":compiler:backend.js")) testCompile(project(":js:js.translator")) diff --git a/js/js.translator/build.gradle.kts b/js/js.translator/build.gradle.kts index e728a3f8f65..79d4a66f22a 100644 --- a/js/js.translator/build.gradle.kts +++ b/js/js.translator/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { compile(project(":js:js.ast")) compile(project(":js:js.frontend")) compile(project(":js:js.parser")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core", "annotations") } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) } } diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index c468a5e4119..66cdd8a09ce 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -44,7 +44,7 @@ dependencies { if (intellijUltimateEnabled) { compileOnly(intellijUltimatePluginDep("NodeJS")) - compileOnly(intellijUltimateDep()) { includeJars("annotations", "trove4j", "openapi", "platform-api", "platform-impl", "java-api", "java-impl", "idea", "util", "jdom") } + compileOnly(intellijUltimateDep()) { includeJars("trove4j", "openapi", "platform-api", "platform-impl", "java-api", "java-impl", "idea", "util", "jdom") } compileOnly(intellijUltimatePluginDep("CSS")) compileOnly(intellijUltimatePluginDep("DatabaseTools")) compileOnly(intellijUltimatePluginDep("JavaEE")) @@ -76,7 +76,7 @@ dependencies { testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } if (intellijUltimateEnabled) { - testCompileOnly(intellijUltimateDep()) { includeJars("platform-api", "platform-impl", "gson", "annotations", "trove4j", "openapi", "idea", "util", "jdom", rootProject = rootProject) } + testCompileOnly(intellijUltimateDep()) { includeJars("platform-api", "platform-impl", "gson", "trove4j", "openapi", "idea", "util", "jdom", rootProject = rootProject) } } testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }