azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Cleanup dependencies in :compiler:fir:raw-fir modules

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-08-17 11:10:32 +03:00
parent b6fd6c3a84
commit d032fdfc44
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/light-tree2fir/build.gradle.kts
+11 -11
View File
@@ -15,25 +15,25 @@ repositories {
} }
dependencies { dependencies {
compile(project(":compiler:fir:raw-fir:raw-fir.common")) api(project(":compiler:fir:raw-fir:raw-fir.common"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
testCompile(intellijDep()) testImplementation(intellijDep())
testImplementation(commonDep("junit:junit"))
testImplementation(projectTests(":compiler:tests-common"))
testImplementation(projectTests(":compiler:fir:raw-fir:psi2fir"))
testCompile(commonDep("junit:junit"))
testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
testCompileOnly(project(":kotlin-test:kotlin-test-junit")) testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(projectTests(":compiler:fir:raw-fir:psi2fir"))
testCompileOnly(project(":kotlin-reflect-api")) testCompileOnly(project(":kotlin-reflect-api"))
testRuntime(project(":kotlin-reflect"))
testRuntime(project(":core:descriptors.runtime"))
compile("org.openjdk.jmh", "jmh-core", jmhVersion) testRuntimeOnly(project(":kotlin-reflect"))
compile("org.openjdk.jmh", "jmh-generator-bytecode", jmhVersion) testRuntimeOnly(project(":core:descriptors.runtime"))
compile("org.openjdk.jmh", "jmh-generator-annprocess", jmhVersion)
implementation("org.openjdk.jmh", "jmh-core", jmhVersion)
implementation("org.openjdk.jmh", "jmh-generator-bytecode", jmhVersion)
implementation("org.openjdk.jmh", "jmh-generator-annprocess", jmhVersion)
Platform[192].orHigher { Platform[192].orHigher {
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compiler/fir/raw-fir/psi2fir/build.gradle.kts
+8 -7
View File
@@ -9,20 +9,21 @@ plugins {
} }
dependencies { dependencies {
compile(project(":compiler:fir:raw-fir:raw-fir.common")) api(project(":compiler:fir:raw-fir:raw-fir.common"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } compileOnly(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) }
testCompile(intellijDep()) testImplementation(intellijDep())
testImplementation(commonDep("junit:junit"))
testImplementation(projectTests(":compiler:tests-common"))
testCompile(commonDep("junit:junit"))
testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
testCompileOnly(project(":kotlin-test:kotlin-test-junit")) testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
testCompile(projectTests(":compiler:tests-common"))
testCompileOnly(project(":kotlin-reflect-api")) testCompileOnly(project(":kotlin-reflect-api"))
testRuntime(project(":kotlin-reflect"))
testRuntime(project(":core:descriptors.runtime")) testRuntimeOnly(project(":kotlin-reflect"))
testRuntimeOnly(project(":core:descriptors.runtime"))
Platform[192].orHigher { Platform[192].orHigher {
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }