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

2/5 Replace source dependency on kotlin-reflect with binary dependency

Browse Source 
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:
Nikita Bobko
2022-07-19 14:52:49 +02:00
parent 276923834f
commit 2a4f3f41aa
41 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler-impl/build.gradle.kts
+2 -2
View File
@@ -16,14 +16,14 @@ dependencies {
api(project(":kotlin-scripting-common"))
api(project(":kotlin-scripting-jvm"))
api(kotlinStdlib())
compileOnly(project(":kotlin-reflect"))
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
// FIXME: drop after removing references to LocalFileSystem they don't exist in intellij-core
compileOnly(intellijAnalysis())
runtimeOnly(project(":kotlin-reflect"))
runtimeOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
testApi(project(":compiler:frontend"))
testApi(project(":compiler:plugin-api"))
plugins/scripting/scripting-compiler/build.gradle.kts
+2 -2
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"))
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
api(project(":kotlin-scripting-common"))
api(project(":kotlin-scripting-jvm"))
api(project(":kotlin-scripting-compiler-impl"))
@@ -33,7 +33,7 @@ dependencies {
testImplementation(intellijCore())
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
testImplementation(project(":kotlin-reflect"))
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
}
optInToExperimentalCompilerApi()
plugins/scripting/scripting-ide-services-test/build.gradle.kts
+1 -1
View File
@@ -28,7 +28,7 @@ dependencies {
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm"))
testImplementation(project(":kotlin-reflect"))
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
testImplementation(project(":analysis:decompiled:decompiler-to-psi"))
testImplementation(project(":analysis:decompiled:decompiler-to-file-stubs"))
testImplementation(intellijCore())
plugins/scripting/scripting-ide-services/build.gradle.kts
+2 -2
View File
@@ -18,11 +18,11 @@ dependencies {
api(project(":kotlin-scripting-jvm"))
compileOnly(project(":kotlin-scripting-compiler"))
compileOnly(project(":compiler:cli"))
compileOnly(project(":kotlin-reflect"))
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
compileOnly(intellijCore())
publishedRuntime(project(":kotlin-compiler"))
publishedRuntime(project(":kotlin-scripting-compiler"))
publishedRuntime(project(":kotlin-reflect"))
publishedRuntime(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
publishedRuntime(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
}