Replace all kotlin-reflect-api dependencies with kotlin-reflect

Review: https://jetbrains.team/p/kt/reviews/6753

Why: I'm going to replace source dependency on kotlin-reflect with
binary dependency. Normalize reflect dependency before global
processing.
This commit is contained in:
Nikita Bobko
2022-07-25 16:14:41 +02:00
parent 8f79e833a8
commit 0874fb71c6
20 changed files with 20 additions and 25 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
api(project(":js:js.config"))
api(project(":native:kotlin-native-utils"))
api(project(":compiler:plugin-api"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-reflect"))
compileOnly(intellijCore())
compileOnly(commonDependency("com.google.guava:guava"))
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
@@ -23,8 +23,7 @@ dependencies {
testApi(project(":compiler:fir:entrypoint"))
testApi(project(":compiler:frontend"))
testCompileOnly(project(":kotlin-reflect-api"))
testRuntimeOnly(project(":kotlin-reflect"))
testImplementation(project(":kotlin-reflect"))
testRuntimeOnly(project(":core:descriptors.runtime"))
testCompileOnly(intellijCore())
+1 -1
View File
@@ -13,7 +13,7 @@ dependencies {
implementation(project(":compiler:frontend.common-psi"))
implementation(project(":compiler:psi"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-reflect"))
compileOnly(intellijCore())
}
@@ -15,7 +15,7 @@ dependencies {
implementation(project(":compiler:frontend"))
implementation(project(":compiler:psi"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-reflect"))
compileOnly(intellijCore())
}
@@ -20,12 +20,11 @@ dependencies {
testImplementation(commonDependency("junit:junit"))
testImplementation(projectTests(":compiler:tests-common"))
testImplementation(project(":kotlin-reflect"))
testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
testCompileOnly(project(":kotlin-reflect-api"))
testRuntimeOnly(project(":kotlin-reflect"))
testRuntimeOnly(project(":core:descriptors.runtime"))
testCompileOnly(intellijCore())
+1 -1
View File
@@ -5,7 +5,7 @@ plugins {
dependencies {
compileOnly(project(":compiler:ir.tree"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-reflect"))
}
sourceSets {
@@ -10,7 +10,7 @@ dependencies {
api(project(":kotlin-util-klib-metadata"))
api(project(":compiler:util"))
implementation(project(":compiler:psi"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-reflect"))
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
@@ -7,9 +7,8 @@ dependencies {
testImplementation(project(":compiler:fir:entrypoint"))
testImplementation(project(":compiler:cli"))
testImplementation(intellijCore())
testImplementation(project(":kotlin-reflect"))
testCompileOnly(project(":kotlin-reflect-api"))
testRuntimeOnly(project(":kotlin-reflect"))
testRuntimeOnly(project(":core:descriptors.runtime"))
// This dependency is needed only for FileComparisonFailure
+1 -1
View File
@@ -56,7 +56,7 @@ dependencies {
testApi(projectTests(":compiler:test-infrastructure-utils"))
testApi(commonDependency("junit:junit"))
testApi(commonDependency("com.android.tools:r8"))
testCompileOnly(project(":kotlin-reflect-api"))
testCompileOnly(project(":kotlin-reflect"))
testCompileOnly(toolsJar())
testCompileOnly(intellijCore())