Fix mass build-failure because of bad dependencies in :compiler:visualizer module

Rename raw-fir:common to raw-fir:common -> raw-fir:fir-common.

If there's dependency both on :compiler:visualizer:common and
:compiler:fir:raw-fir:common, only one of artifact is left in classpath
This commit is contained in:
Nikolay Krasko
2020-03-26 01:19:52 +03:00
parent 01c36d19bb
commit 034af78b0f
9 changed files with 9 additions and 10 deletions
+1 -1
View File
@@ -256,7 +256,7 @@ extra["compilerModules"] = arrayOf(
":compiler:fir:cones", ":compiler:fir:cones",
":compiler:fir:resolve", ":compiler:fir:resolve",
":compiler:fir:tree", ":compiler:fir:tree",
":compiler:fir:raw-fir:common", ":compiler:fir:raw-fir:fir-common",
":compiler:fir:raw-fir:psi2fir", ":compiler:fir:raw-fir:psi2fir",
":compiler:fir:raw-fir:light-tree2fir", ":compiler:fir:raw-fir:light-tree2fir",
":compiler:fir:fir2ir", ":compiler:fir:fir2ir",
@@ -15,7 +15,7 @@ repositories {
} }
dependencies { dependencies {
compile(project(":compiler:fir:raw-fir:common")) compile(project(":compiler:fir:raw-fir:fir-common"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
@@ -9,7 +9,7 @@ plugins {
} }
dependencies { dependencies {
compile(project(":compiler:fir:raw-fir:common")) compile(project(":compiler:fir:raw-fir:fir-common"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
+5 -6
View File
@@ -7,15 +7,14 @@ dependencies {
testRuntime(intellijDep()) testRuntime(intellijDep())
testCompile(intellijCoreDep()) { includeJars("intellij-core") } testCompile(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(project(":compiler:fir:raw-fir:psi2fir")) testCompileOnly(project(":compiler:fir:raw-fir:psi2fir"))
testCompile(project(":compiler:visualizer:render-psi"))
testCompile(project(":compiler:visualizer:render-fir")) testCompileOnly(project(":compiler:visualizer:render-psi"))
testCompile(project(":compiler:visualizer:common")) testCompileOnly(project(":compiler:visualizer:render-fir"))
testCompile(commonDep("junit:junit")) testCompile(commonDep("junit:junit"))
testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common"))
testCompile(projectTests(":compiler:fir:analysis-tests")) testCompile(projectTests(":compiler:fir:analysis-tests"))
} }
sourceSets { sourceSets {
+1 -1
View File
@@ -80,7 +80,7 @@ include ":kotlin-build-common",
":compiler:fir:cones", ":compiler:fir:cones",
":compiler:fir:tree", ":compiler:fir:tree",
":compiler:fir:tree:tree-generator", ":compiler:fir:tree:tree-generator",
":compiler:fir:raw-fir:common", ":compiler:fir:raw-fir:fir-common",
":compiler:fir:raw-fir:psi2fir", ":compiler:fir:raw-fir:psi2fir",
":compiler:fir:raw-fir:light-tree2fir", ":compiler:fir:raw-fir:light-tree2fir",
":compiler:fir:fir2ir", ":compiler:fir:fir2ir",