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:
@@ -27,7 +27,7 @@ dependencies {
|
||||
testApi(project(":kotlin-compiler-embeddable"))
|
||||
testApi(commonDependency("junit:junit"))
|
||||
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||
compilerClasspath(project(":kotlin-reflect"))
|
||||
compilerClasspath(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
compilerClasspath(kotlinStdlib())
|
||||
compilerClasspath(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
||||
compilerClasspath(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||
|
||||
@@ -41,7 +41,7 @@ dependencies {
|
||||
testImplementation(project(":kotlin-test:kotlin-test-junit"))
|
||||
testImplementation(commonDependency("junit:junit"))
|
||||
testImplementation(commonDependency("org.jetbrains.intellij.deps:asm-all"))
|
||||
testImplementation(project(":kotlin-reflect"))
|
||||
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
}
|
||||
|
||||
if (deployVersion != null) {
|
||||
|
||||
@@ -7,7 +7,7 @@ project.updateJvmTarget("1.8")
|
||||
|
||||
dependencies {
|
||||
api(kotlinStdlib())
|
||||
compileOnly(project(":kotlin-reflect"))
|
||||
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
testApi(commonDependency("junit"))
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ dependencies {
|
||||
testImplementation(projectTests(":kotlin-scripting-dependencies"))
|
||||
testImplementation(commonDependency("junit"))
|
||||
testRuntimeOnly("org.slf4j:slf4j-nop:1.7.36")
|
||||
testImplementation(project(":kotlin-reflect"))
|
||||
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||
}
|
||||
|
||||
|
||||
@@ -13,10 +13,10 @@ dependencies {
|
||||
api(project(":kotlin-scripting-jvm-host-unshaded"))
|
||||
api(project(":kotlin-scripting-compiler"))
|
||||
compileOnly(project(":compiler:cli-common"))
|
||||
compileOnly(project(":kotlin-reflect"))
|
||||
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
compileOnly(intellijCore())
|
||||
publishedRuntime(project(":kotlin-compiler"))
|
||||
publishedRuntime(project(":kotlin-reflect"))
|
||||
publishedRuntime(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -21,7 +21,7 @@ dependencies {
|
||||
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||
|
||||
testRuntimeOnly(project(":kotlin-compiler"))
|
||||
testImplementation(project(":kotlin-reflect"))
|
||||
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
||||
|
||||
embeddableTestRuntime(project(":kotlin-scripting-jvm-host"))
|
||||
|
||||
@@ -13,11 +13,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"))
|
||||
}
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ dependencies {
|
||||
compileOnly(project(":kotlin-scripting-dependencies-maven"))
|
||||
runtimeOnly(project(":kotlin-scripting-compiler-embeddable"))
|
||||
runtimeOnly(kotlinStdlib())
|
||||
runtimeOnly(project(":kotlin-reflect"))
|
||||
runtimeOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
embedded(project(":kotlin-scripting-common")) { isTransitive = false }
|
||||
embedded(project(":kotlin-scripting-jvm")) { isTransitive = false }
|
||||
embedded(project(":kotlin-scripting-jvm-host-unshaded")) { isTransitive = false }
|
||||
@@ -46,7 +46,7 @@ dependencies {
|
||||
}
|
||||
|
||||
proguardLibraryJars(kotlinStdlib())
|
||||
proguardLibraryJars(project(":kotlin-reflect"))
|
||||
proguardLibraryJars(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
proguardLibraryJars(project(":kotlin-compiler"))
|
||||
|
||||
relocatedJarContents(embedded)
|
||||
|
||||
@@ -11,8 +11,8 @@ dependencies {
|
||||
testApi(testFixtures(project(":kotlin-project-model")))
|
||||
testApi(project(":kotlin-project-model"))
|
||||
testApi(projectTests(":kotlin-gradle-plugin-integration-tests"))
|
||||
testCompileOnly(project(":kotlin-reflect"))
|
||||
testImplementation(project(":kotlin-reflect"))
|
||||
testCompileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
testImplementation(projectTests(":compiler:test-infrastructure-utils"))
|
||||
testImplementation(projectTests(":compiler:test-infrastructure"))
|
||||
testImplementation(projectTests(":compiler:tests-common-new"))
|
||||
|
||||
@@ -17,7 +17,7 @@ dependencies {
|
||||
testFixturesImplementation(project(":kotlin-tooling-core"))
|
||||
testFixturesImplementation(project(":core:util.runtime"))
|
||||
testFixturesImplementation(projectTests(":generators:test-generator"))
|
||||
testFixturesImplementation(project(":kotlin-reflect"))
|
||||
testFixturesImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||
}
|
||||
|
||||
projectTest(jUnitMode = JUnitMode.JUnit5) {
|
||||
|
||||
Reference in New Issue
Block a user