2/5 Replace source dependency on kotlin-reflect with binary dependency
Review: https://jetbrains.team/p/kt/reviews/6753 Meaningful semantic change was splitted into 5 commits to simplify the change review. Sinle commit would be too big. Why replace source to binary: to get rid of kotlin-reflect in Kotlin plugin artifact KTIJ-22276 Note: Kotlin Maven artifacts (./gradlew publish) changed their dependency on kotlin-reflect
This commit is contained in:
@@ -35,7 +35,7 @@ dependencies {
|
||||
testCompileOnly(project(it))
|
||||
}
|
||||
|
||||
testImplementation(project(":kotlin-reflect"))
|
||||
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
testImplementation(toolsJar())
|
||||
|
||||
antLauncherJar(commonDependency("org.apache.ant", "ant"))
|
||||
|
||||
@@ -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"))
|
||||
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
compileOnly(intellijCore())
|
||||
compileOnly(commonDependency("com.google.guava:guava"))
|
||||
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
|
||||
|
||||
@@ -16,7 +16,7 @@ dependencies {
|
||||
compileOnly(intellijCore())
|
||||
compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
|
||||
|
||||
runtimeOnly(project(":kotlin-reflect"))
|
||||
runtimeOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
|
||||
embedded(project(":daemon-common")) { isTransitive = false }
|
||||
api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
|
||||
|
||||
@@ -23,7 +23,7 @@ dependencies {
|
||||
testApi(project(":compiler:fir:entrypoint"))
|
||||
testApi(project(":compiler:frontend"))
|
||||
|
||||
testImplementation(project(":kotlin-reflect"))
|
||||
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
testRuntimeOnly(project(":core:descriptors.runtime"))
|
||||
|
||||
testCompileOnly(intellijCore())
|
||||
|
||||
@@ -13,7 +13,7 @@ dependencies {
|
||||
implementation(project(":compiler:frontend.common-psi"))
|
||||
implementation(project(":compiler:psi"))
|
||||
|
||||
compileOnly(project(":kotlin-reflect"))
|
||||
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
compileOnly(intellijCore())
|
||||
}
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ dependencies {
|
||||
implementation(project(":compiler:fir:tree"))
|
||||
implementation(project(":compiler:fir:tree:tree-generator"))
|
||||
implementation(project(":compiler:resolution.common"))
|
||||
implementation(project(":kotlin-reflect"))
|
||||
implementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
|
||||
/*
|
||||
We do not need guava in the generator, but because of a bug in the IJ project importing, we need to have a dependency on intellijCore
|
||||
|
||||
@@ -15,7 +15,7 @@ dependencies {
|
||||
implementation(project(":compiler:frontend"))
|
||||
implementation(project(":compiler:psi"))
|
||||
|
||||
compileOnly(project(":kotlin-reflect"))
|
||||
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
compileOnly(intellijCore())
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ dependencies {
|
||||
|
||||
testImplementation(commonDependency("junit:junit"))
|
||||
testImplementation(projectTests(":compiler:tests-common"))
|
||||
testImplementation(project(":kotlin-reflect"))
|
||||
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
|
||||
testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
|
||||
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
|
||||
|
||||
@@ -30,7 +30,7 @@ dependencies {
|
||||
testApi(commonDependency("org.jetbrains.intellij.deps:jdom"))
|
||||
|
||||
testImplementation(commonDependency("com.google.code.gson:gson"))
|
||||
testRuntimeOnly(project(":kotlin-reflect"))
|
||||
testRuntimeOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
testRuntimeOnly(project(":core:descriptors.runtime"))
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ plugins {
|
||||
|
||||
dependencies {
|
||||
compileOnly(project(":compiler:ir.tree"))
|
||||
compileOnly(project(":kotlin-reflect"))
|
||||
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -10,7 +10,7 @@ dependencies {
|
||||
api(project(":kotlin-util-klib-metadata"))
|
||||
api(project(":compiler:util"))
|
||||
implementation(project(":compiler:psi"))
|
||||
compileOnly(project(":kotlin-reflect"))
|
||||
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
|
||||
compileOnly(intellijCore())
|
||||
compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
|
||||
|
||||
@@ -7,7 +7,7 @@ dependencies {
|
||||
testImplementation(project(":compiler:fir:entrypoint"))
|
||||
testImplementation(project(":compiler:cli"))
|
||||
testImplementation(intellijCore())
|
||||
testImplementation(project(":kotlin-reflect"))
|
||||
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
|
||||
testRuntimeOnly(project(":core:descriptors.runtime"))
|
||||
|
||||
|
||||
@@ -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"))
|
||||
testCompileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
testCompileOnly(toolsJar())
|
||||
testCompileOnly(intellijCore())
|
||||
|
||||
|
||||
Reference in New Issue
Block a user