From 7d4349edc2915671583dcfac65634862fdd35c1e Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 17 Aug 2020 10:48:29 +0300 Subject: [PATCH] [FIR] Remove dependency on descriptors from :compiler:fir:tree module --- compiler/fir/tree/build.gradle.kts | 5 ++--- compiler/fir/tree/tree-generator/build.gradle.kts | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/compiler/fir/tree/build.gradle.kts b/compiler/fir/tree/build.gradle.kts index 01fae5c1645..4dd926a7d43 100644 --- a/compiler/fir/tree/build.gradle.kts +++ b/compiler/fir/tree/build.gradle.kts @@ -6,10 +6,9 @@ plugins { } dependencies { - api(project(":compiler:fir:cones")) api(project(":core:deserialization:deserialization.common")) - compile(project(":compiler:resolution")) - compile(project(":compiler:frontend.common")) + api(project(":compiler:frontend.common")) + api(project(":compiler:fir:cones")) // Necessary only to store bound PsiElement inside FirElement compileOnly(intellijCoreDep()) { includeJars("intellij-core") } diff --git a/compiler/fir/tree/tree-generator/build.gradle.kts b/compiler/fir/tree/tree-generator/build.gradle.kts index 5405a865b6c..ed8f2a8ff16 100644 --- a/compiler/fir/tree/tree-generator/build.gradle.kts +++ b/compiler/fir/tree/tree-generator/build.gradle.kts @@ -11,11 +11,10 @@ val compileOnly by configurations runtimeOnly.extendsFrom(compileOnly) dependencies { - compile(project(":compiler:frontend.common")) implementation(project(":core:deserialization:deserialization.common")) - compile(project(":core:descriptors")) - compile(project(":compiler:fir:cones")) - compile(project(":compiler:resolution")) + implementation(project(":core:descriptors.common")) + implementation(project(":compiler:frontend.common")) + implementation(project(":compiler:fir:cones")) compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } Platform[193].orLower {