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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/build.gradle.kts
+1 -1
View File
@@ -9,7 +9,7 @@ kotlin {
dependencies {
implementation(kotlinxCollectionsImmutable())
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-reflect"))
compileOnly(project(":compiler:psi"))
compileOnly(project(":compiler:frontend"))
build-common/build.gradle.kts
+1 -1
View File
@@ -14,7 +14,7 @@ dependencies {
compileOnly(project(":js:js.serializer"))
compileOnly(project(":js:js.config"))
compileOnly(project(":kotlin-util-klib-metadata"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-reflect"))
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
compiler/cli/cli-common/build.gradle.kts
+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"))
compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts
+1 -2
View File
@@ -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())
compiler/fir/checkers/build.gradle.kts
+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())
}
compiler/fir/checkers/checkers.native/build.gradle.kts
+1 -1
View File
@@ -15,7 +15,7 @@ dependencies {
implementation(project(":compiler:frontend"))
implementation(project(":compiler:psi"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-reflect"))
compileOnly(intellijCore())
}
compiler/fir/raw-fir/psi2fir/build.gradle.kts
+1 -2
View File
@@ -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())
compiler/ir/ir.interpreter/build.gradle.kts
+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 {
compiler/ir/serialization.common/build.gradle.kts
+1 -1
View File
@@ -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"))
compiler/test-infrastructure-utils/build.gradle.kts
+1 -2
View File
@@ -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
compiler/tests-common/build.gradle.kts
+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())
generators/test-generator/build.gradle.kts
+1 -2
View File
@@ -12,8 +12,7 @@ dependencies {
testApiJUnit5()
testApi(project(":generators"))
testCompileOnly(project(":kotlin-reflect-api"))
testRuntimeOnly(project(":kotlin-reflect"))
testImplementation(project(":kotlin-reflect"))
testRuntimeOnly(project(":core:descriptors.runtime"))
}
libraries/kotlinx-metadata/jvm/build.gradle.kts
+1 -2
View File
@@ -41,8 +41,7 @@ dependencies {
testImplementation(project(":kotlin-test:kotlin-test-junit"))
testImplementation(commonDependency("junit:junit"))
testImplementation(commonDependency("org.jetbrains.intellij.deps:asm-all"))
testCompileOnly(project(":kotlin-reflect-api"))
testRuntimeOnly(project(":kotlin-reflect"))
testImplementation(project(":kotlin-reflect"))
}
if (deployVersion != null) {
libraries/scripting/common/build.gradle.kts
+1 -1
View File
@@ -7,7 +7,7 @@ project.updateJvmTarget("1.8")
dependencies {
api(kotlinStdlib())
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-reflect"))
testApi(commonDependency("junit"))
}
libraries/scripting/jsr223/build.gradle.kts
+1 -1
View File
@@ -13,7 +13,7 @@ dependencies {
api(project(":kotlin-scripting-jvm-host-unshaded"))
api(project(":kotlin-scripting-compiler"))
compileOnly(project(":compiler:cli-common"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-reflect"))
compileOnly(intellijCore())
publishedRuntime(project(":kotlin-compiler"))
publishedRuntime(project(":kotlin-reflect"))
libraries/scripting/jvm-host/build.gradle.kts
+1 -1
View File
@@ -13,7 +13,7 @@ dependencies {
api(project(":kotlin-scripting-jvm"))
compileOnly(project(":kotlin-scripting-compiler"))
compileOnly(project(":compiler:cli"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-reflect"))
compileOnly(intellijCore())
publishedRuntime(project(":kotlin-compiler"))
publishedRuntime(project(":kotlin-scripting-compiler"))
libraries/tools/kotlin-project-model-tests-generator/build.gradle.kts
+1 -1
View File
@@ -11,7 +11,7 @@ dependencies {
testApi(testFixtures(project(":kotlin-project-model")))
testApi(project(":kotlin-project-model"))
testApi(projectTests(":kotlin-gradle-plugin-integration-tests"))
testCompileOnly(project(":kotlin-reflect-api"))
testCompileOnly(project(":kotlin-reflect"))
testImplementation(project(":kotlin-reflect"))
testImplementation(projectTests(":compiler:test-infrastructure-utils"))
testImplementation(projectTests(":compiler:test-infrastructure"))
plugins/scripting/scripting-compiler-impl/build.gradle.kts
+1 -1
View File
@@ -16,7 +16,7 @@ dependencies {
api(project(":kotlin-scripting-common"))
api(project(":kotlin-scripting-jvm"))
api(kotlinStdlib())
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-reflect"))
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
plugins/scripting/scripting-compiler/build.gradle.kts
+1 -1
View File
@@ -14,7 +14,7 @@ dependencies {
compileOnly(project(":core:descriptors.runtime"))
compileOnly(project(":compiler:ir.tree"))
compileOnly(project(":compiler:backend.jvm.entrypoint"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-reflect"))
api(project(":kotlin-scripting-common"))
api(project(":kotlin-scripting-jvm"))
api(project(":kotlin-scripting-compiler-impl"))
plugins/scripting/scripting-ide-services/build.gradle.kts
+1 -1
View File
@@ -18,7 +18,7 @@ dependencies {
api(project(":kotlin-scripting-jvm"))
compileOnly(project(":kotlin-scripting-compiler"))
compileOnly(project(":compiler:cli"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(project(":kotlin-reflect"))
compileOnly(intellijCore())
publishedRuntime(project(":kotlin-compiler"))
publishedRuntime(project(":kotlin-scripting-compiler"))