From d032fdfc4408b0f0013e073c4b042b057d03c154 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 17 Aug 2020 11:10:32 +0300 Subject: [PATCH] [FIR] Cleanup dependencies in :compiler:fir:raw-fir modules --- .../raw-fir/light-tree2fir/build.gradle.kts | 22 +++++++++---------- compiler/fir/raw-fir/psi2fir/build.gradle.kts | 15 +++++++------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts index 6690c7e3d38..61f9d606fa1 100644 --- a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts +++ b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts @@ -15,25 +15,25 @@ repositories { } 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) } - 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-junit")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(projectTests(":compiler:fir:raw-fir:psi2fir")) - testCompileOnly(project(":kotlin-reflect-api")) - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":core:descriptors.runtime")) - compile("org.openjdk.jmh", "jmh-core", jmhVersion) - compile("org.openjdk.jmh", "jmh-generator-bytecode", jmhVersion) - compile("org.openjdk.jmh", "jmh-generator-annprocess", jmhVersion) + testRuntimeOnly(project(":kotlin-reflect")) + testRuntimeOnly(project(":core:descriptors.runtime")) + + 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 { testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } diff --git a/compiler/fir/raw-fir/psi2fir/build.gradle.kts b/compiler/fir/raw-fir/psi2fir/build.gradle.kts index 32dd00c9f03..0dcb1be4193 100644 --- a/compiler/fir/raw-fir/psi2fir/build.gradle.kts +++ b/compiler/fir/raw-fir/psi2fir/build.gradle.kts @@ -9,20 +9,21 @@ plugins { } 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) } - 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-junit")) - testCompile(projectTests(":compiler:tests-common")) - 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 { testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }