From 3b33df6564d8465bff3190ca9b4dbf2d84339b43 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 28 Jan 2020 11:42:41 +0700 Subject: [PATCH] Reduce external dependencies in :kotlin-native:kotlin-native-library-reader --- idea/idea-core/build.gradle.kts | 1 + idea/idea-gradle/build.gradle.kts | 2 ++ idea/idea-native/build.gradle.kts | 3 ++- konan/library-reader/build.gradle.kts | 7 ------- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts index dd65ff4d920..e7ad2ffe485 100644 --- a/idea/idea-core/build.gradle.kts +++ b/idea/idea-core/build.gradle.kts @@ -16,6 +16,7 @@ dependencies { compile(project(":compiler:util")) compile(project(":idea:ide-common")) compile(project(":idea:idea-jps-common")) + compile(project(":kotlin-util-klib-metadata")) compile(project(":plugins:android-extensions-compiler")) compile(project(":kotlin-scripting-compiler-impl")) compile(project(":compiler:fir:psi2fir")) diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 9f6fb41f326..37ec5afa3c7 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -17,6 +17,8 @@ dependencies { compile(project(":js:js.frontend")) + compile(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } + compileOnly(intellijDep()) compileOnly(intellijPluginDep("gradle")) Platform[193].orHigher { diff --git a/idea/idea-native/build.gradle.kts b/idea/idea-native/build.gradle.kts index c428880e9b9..a158f1c1d71 100644 --- a/idea/idea-native/build.gradle.kts +++ b/idea/idea-native/build.gradle.kts @@ -13,7 +13,8 @@ dependencies { compileOnly(intellijPluginDep("java")) } compile(project(":kotlin-native:kotlin-native-library-reader")) - + compile(project(":kotlin-native:kotlin-native-utils")) + testCompileOnly(intellijDep()) testRuntimeOnly(intellijDep()) } diff --git a/konan/library-reader/build.gradle.kts b/konan/library-reader/build.gradle.kts index 02717b4daa8..d2c520f7c24 100644 --- a/konan/library-reader/build.gradle.kts +++ b/konan/library-reader/build.gradle.kts @@ -1,5 +1,4 @@ plugins { - maven kotlin("jvm") id("jps-compatible") } @@ -7,12 +6,6 @@ plugins { dependencies { compileOnly(project(":compiler:frontend")) compileOnly(project(":compiler:frontend.java")) - compileOnly(project(":compiler:cli-common")) - - compile(project(":kotlin-native:kotlin-native-utils")) - compile(project(":kotlin-util-io")) - compile(project(":kotlin-util-klib")) - compile(project(":kotlin-util-klib-metadata")) } sourceSets {