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:
@@ -11,7 +11,7 @@ dependencies {
|
|||||||
implementation(project(":compiler:fir:checkers:checkers-component-generator"))
|
implementation(project(":compiler:fir:checkers:checkers-component-generator"))
|
||||||
implementation(project(":analysis:analysis-api"))
|
implementation(project(":analysis:analysis-api"))
|
||||||
|
|
||||||
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
|
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
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ dependencies {
|
|||||||
testApi(project(":analysis:decompiled:decompiler-to-file-stubs"))
|
testApi(project(":analysis:decompiled:decompiler-to-file-stubs"))
|
||||||
testApi(project(":analysis:decompiled:decompiler-to-psi"))
|
testApi(project(":analysis:decompiled:decompiler-to-psi"))
|
||||||
testApi(projectTests(":analysis:analysis-test-framework"))
|
testApi(projectTests(":analysis:analysis-test-framework"))
|
||||||
testImplementation(project(":kotlin-reflect"))
|
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
testImplementation(toolsJar())
|
testImplementation(toolsJar())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ kotlin {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(kotlinxCollectionsImmutable())
|
implementation(kotlinxCollectionsImmutable())
|
||||||
compileOnly(project(":kotlin-reflect"))
|
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
|
|
||||||
compileOnly(project(":compiler:psi"))
|
compileOnly(project(":compiler:psi"))
|
||||||
compileOnly(project(":compiler:frontend"))
|
compileOnly(project(":compiler:frontend"))
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ dependencies {
|
|||||||
compileOnly(project(":js:js.serializer"))
|
compileOnly(project(":js:js.serializer"))
|
||||||
compileOnly(project(":js:js.config"))
|
compileOnly(project(":js:js.config"))
|
||||||
compileOnly(project(":kotlin-util-klib-metadata"))
|
compileOnly(project(":kotlin-util-klib-metadata"))
|
||||||
compileOnly(project(":kotlin-reflect"))
|
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
|
|
||||||
compileOnly(intellijCore())
|
compileOnly(intellijCore())
|
||||||
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
|
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
|
||||||
@@ -25,7 +25,7 @@ dependencies {
|
|||||||
testApi(commonDependency("junit:junit"))
|
testApi(commonDependency("junit:junit"))
|
||||||
testApi(protobufFull())
|
testApi(protobufFull())
|
||||||
testApi(kotlinStdlib())
|
testApi(kotlinStdlib())
|
||||||
testImplementation(project(":kotlin-reflect"))
|
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ dependencies {
|
|||||||
testCompileOnly(project(it))
|
testCompileOnly(project(it))
|
||||||
}
|
}
|
||||||
|
|
||||||
testImplementation(project(":kotlin-reflect"))
|
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
testImplementation(toolsJar())
|
testImplementation(toolsJar())
|
||||||
|
|
||||||
antLauncherJar(commonDependency("org.apache.ant", "ant"))
|
antLauncherJar(commonDependency("org.apache.ant", "ant"))
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ dependencies {
|
|||||||
api(project(":js:js.config"))
|
api(project(":js:js.config"))
|
||||||
api(project(":native:kotlin-native-utils"))
|
api(project(":native:kotlin-native-utils"))
|
||||||
api(project(":compiler:plugin-api"))
|
api(project(":compiler:plugin-api"))
|
||||||
compileOnly(project(":kotlin-reflect"))
|
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
compileOnly(intellijCore())
|
compileOnly(intellijCore())
|
||||||
compileOnly(commonDependency("com.google.guava:guava"))
|
compileOnly(commonDependency("com.google.guava:guava"))
|
||||||
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
|
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ dependencies {
|
|||||||
compileOnly(intellijCore())
|
compileOnly(intellijCore())
|
||||||
compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
|
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 }
|
embedded(project(":daemon-common")) { isTransitive = false }
|
||||||
api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
|
api(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ dependencies {
|
|||||||
testApi(project(":compiler:fir:entrypoint"))
|
testApi(project(":compiler:fir:entrypoint"))
|
||||||
testApi(project(":compiler:frontend"))
|
testApi(project(":compiler:frontend"))
|
||||||
|
|
||||||
testImplementation(project(":kotlin-reflect"))
|
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
testRuntimeOnly(project(":core:descriptors.runtime"))
|
testRuntimeOnly(project(":core:descriptors.runtime"))
|
||||||
|
|
||||||
testCompileOnly(intellijCore())
|
testCompileOnly(intellijCore())
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ dependencies {
|
|||||||
implementation(project(":compiler:frontend.common-psi"))
|
implementation(project(":compiler:frontend.common-psi"))
|
||||||
implementation(project(":compiler:psi"))
|
implementation(project(":compiler:psi"))
|
||||||
|
|
||||||
compileOnly(project(":kotlin-reflect"))
|
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
compileOnly(intellijCore())
|
compileOnly(intellijCore())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ dependencies {
|
|||||||
implementation(project(":compiler:fir:tree"))
|
implementation(project(":compiler:fir:tree"))
|
||||||
implementation(project(":compiler:fir:tree:tree-generator"))
|
implementation(project(":compiler:fir:tree:tree-generator"))
|
||||||
implementation(project(":compiler:resolution.common"))
|
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
|
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:frontend"))
|
||||||
implementation(project(":compiler:psi"))
|
implementation(project(":compiler:psi"))
|
||||||
|
|
||||||
compileOnly(project(":kotlin-reflect"))
|
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
compileOnly(intellijCore())
|
compileOnly(intellijCore())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ dependencies {
|
|||||||
|
|
||||||
testImplementation(commonDependency("junit:junit"))
|
testImplementation(commonDependency("junit:junit"))
|
||||||
testImplementation(projectTests(":compiler:tests-common"))
|
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-jvm"))
|
||||||
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
|
testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ dependencies {
|
|||||||
testApi(commonDependency("org.jetbrains.intellij.deps:jdom"))
|
testApi(commonDependency("org.jetbrains.intellij.deps:jdom"))
|
||||||
|
|
||||||
testImplementation(commonDependency("com.google.code.gson:gson"))
|
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"))
|
testRuntimeOnly(project(":core:descriptors.runtime"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ plugins {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(project(":compiler:ir.tree"))
|
compileOnly(project(":compiler:ir.tree"))
|
||||||
compileOnly(project(":kotlin-reflect"))
|
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ dependencies {
|
|||||||
api(project(":kotlin-util-klib-metadata"))
|
api(project(":kotlin-util-klib-metadata"))
|
||||||
api(project(":compiler:util"))
|
api(project(":compiler:util"))
|
||||||
implementation(project(":compiler:psi"))
|
implementation(project(":compiler:psi"))
|
||||||
compileOnly(project(":kotlin-reflect"))
|
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
|
|
||||||
compileOnly(intellijCore())
|
compileOnly(intellijCore())
|
||||||
compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
|
compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ dependencies {
|
|||||||
testImplementation(project(":compiler:fir:entrypoint"))
|
testImplementation(project(":compiler:fir:entrypoint"))
|
||||||
testImplementation(project(":compiler:cli"))
|
testImplementation(project(":compiler:cli"))
|
||||||
testImplementation(intellijCore())
|
testImplementation(intellijCore())
|
||||||
testImplementation(project(":kotlin-reflect"))
|
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
|
|
||||||
testRuntimeOnly(project(":core:descriptors.runtime"))
|
testRuntimeOnly(project(":core:descriptors.runtime"))
|
||||||
|
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ dependencies {
|
|||||||
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
testApi(projectTests(":compiler:test-infrastructure-utils"))
|
||||||
testApi(commonDependency("junit:junit"))
|
testApi(commonDependency("junit:junit"))
|
||||||
testApi(commonDependency("com.android.tools:r8"))
|
testApi(commonDependency("com.android.tools:r8"))
|
||||||
testCompileOnly(project(":kotlin-reflect"))
|
testCompileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
testCompileOnly(toolsJar())
|
testCompileOnly(toolsJar())
|
||||||
testCompileOnly(intellijCore())
|
testCompileOnly(intellijCore())
|
||||||
|
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ dependencies {
|
|||||||
testApi(projectTests(":plugins:fir-plugin-prototype"))
|
testApi(projectTests(":plugins:fir-plugin-prototype"))
|
||||||
testApi(projectTests(":plugins:fir-plugin-prototype:fir-plugin-ic-test"))
|
testApi(projectTests(":plugins:fir-plugin-prototype:fir-plugin-ic-test"))
|
||||||
testApi(projectTests(":generators:test-generator"))
|
testApi(projectTests(":generators:test-generator"))
|
||||||
testImplementation(project(":kotlin-reflect"))
|
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
testImplementation(projectTests(":compiler:test-infrastructure-utils"))
|
testImplementation(projectTests(":compiler:test-infrastructure-utils"))
|
||||||
testImplementation(projectTests(":compiler:test-infrastructure"))
|
testImplementation(projectTests(":compiler:test-infrastructure"))
|
||||||
testImplementation(projectTests(":compiler:tests-common-new"))
|
testImplementation(projectTests(":compiler:tests-common-new"))
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ dependencies {
|
|||||||
testApiJUnit5()
|
testApiJUnit5()
|
||||||
testApi(project(":generators"))
|
testApi(project(":generators"))
|
||||||
|
|
||||||
testImplementation(project(":kotlin-reflect"))
|
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
testRuntimeOnly(project(":core:descriptors.runtime"))
|
testRuntimeOnly(project(":core:descriptors.runtime"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ native {
|
|||||||
dependencies {
|
dependencies {
|
||||||
implementation(project(":kotlin-native:utilities:basic-utils"))
|
implementation(project(":kotlin-native:utilities:basic-utils"))
|
||||||
implementation(project(":kotlin-stdlib"))
|
implementation(project(":kotlin-stdlib"))
|
||||||
implementation(project(":kotlin-reflect"))
|
implementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets.main.get().java.srcDir("src/jvm/kotlin")
|
sourceSets.main.get().java.srcDir("src/jvm/kotlin")
|
||||||
|
|||||||
@@ -107,7 +107,9 @@ dependencies {
|
|||||||
trove4j_jar "org.jetbrains.intellij.deps:trove4j:1.0.20181211@jar"
|
trove4j_jar "org.jetbrains.intellij.deps:trove4j:1.0.20181211@jar"
|
||||||
kotlin_compiler_jar project(kotlinCompilerModule)
|
kotlin_compiler_jar project(kotlinCompilerModule)
|
||||||
kotlin_stdlib_jar kotlinStdLibModule
|
kotlin_stdlib_jar kotlinStdLibModule
|
||||||
kotlin_reflect_jar project(":kotlin-reflect")
|
use(DependenciesKt) {
|
||||||
|
kotlin_reflect_jar commonDependency("org.jetbrains.kotlin:kotlin-reflect")
|
||||||
|
}
|
||||||
kotlin_script_runtime_jar project(":kotlin-script-runtime")
|
kotlin_script_runtime_jar project(":kotlin-script-runtime")
|
||||||
|
|
||||||
compilerApi project(":kotlin-native:utilities:basic-utils")
|
compilerApi project(":kotlin-native:utilities:basic-utils")
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ dependencies {
|
|||||||
commonApi(project(":kotlin-gradle-plugin"))
|
commonApi(project(":kotlin-gradle-plugin"))
|
||||||
commonApi(project(":kotlin-gradle-plugin-api"))
|
commonApi(project(":kotlin-gradle-plugin-api"))
|
||||||
commonApi(project(":kotlin-gradle-plugin-model"))
|
commonApi(project(":kotlin-gradle-plugin-model"))
|
||||||
implementation(project(":kotlin-reflect"))
|
implementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}")
|
implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}")
|
||||||
|
|
||||||
implementation("com.ullink.slack:simpleslackapi:$slackApiVersion") {
|
implementation("com.ullink.slack:simpleslackapi:$slackApiVersion") {
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ dependencies {
|
|||||||
kotlinCompilerClasspath("org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion")
|
kotlinCompilerClasspath("org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion")
|
||||||
|
|
||||||
implementation(kotlinStdlib())
|
implementation(kotlinStdlib())
|
||||||
implementation(project(":kotlin-reflect"))
|
implementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
api("org.jetbrains.kotlin:kotlin-native-utils:$kotlinVersion")
|
api("org.jetbrains.kotlin:kotlin-native-utils:$kotlinVersion")
|
||||||
api("org.jetbrains.kotlin:kotlin-util-klib:$kotlinVersion")
|
api("org.jetbrains.kotlin:kotlin-util-klib:$kotlinVersion")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ dependencies {
|
|||||||
testApi(project(":kotlin-compiler-embeddable"))
|
testApi(project(":kotlin-compiler-embeddable"))
|
||||||
testApi(commonDependency("junit:junit"))
|
testApi(commonDependency("junit:junit"))
|
||||||
testApi(project(":kotlin-test:kotlin-test-junit"))
|
testApi(project(":kotlin-test:kotlin-test-junit"))
|
||||||
compilerClasspath(project(":kotlin-reflect"))
|
compilerClasspath(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
compilerClasspath(kotlinStdlib())
|
compilerClasspath(kotlinStdlib())
|
||||||
compilerClasspath(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
compilerClasspath(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
||||||
compilerClasspath(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
compilerClasspath(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ dependencies {
|
|||||||
testImplementation(project(":kotlin-test:kotlin-test-junit"))
|
testImplementation(project(":kotlin-test:kotlin-test-junit"))
|
||||||
testImplementation(commonDependency("junit:junit"))
|
testImplementation(commonDependency("junit:junit"))
|
||||||
testImplementation(commonDependency("org.jetbrains.intellij.deps:asm-all"))
|
testImplementation(commonDependency("org.jetbrains.intellij.deps:asm-all"))
|
||||||
testImplementation(project(":kotlin-reflect"))
|
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
}
|
}
|
||||||
|
|
||||||
if (deployVersion != null) {
|
if (deployVersion != null) {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ project.updateJvmTarget("1.8")
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
compileOnly(project(":kotlin-reflect"))
|
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
testApi(commonDependency("junit"))
|
testApi(commonDependency("junit"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ dependencies {
|
|||||||
testImplementation(projectTests(":kotlin-scripting-dependencies"))
|
testImplementation(projectTests(":kotlin-scripting-dependencies"))
|
||||||
testImplementation(commonDependency("junit"))
|
testImplementation(commonDependency("junit"))
|
||||||
testRuntimeOnly("org.slf4j:slf4j-nop:1.7.36")
|
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"))
|
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,10 +13,10 @@ dependencies {
|
|||||||
api(project(":kotlin-scripting-jvm-host-unshaded"))
|
api(project(":kotlin-scripting-jvm-host-unshaded"))
|
||||||
api(project(":kotlin-scripting-compiler"))
|
api(project(":kotlin-scripting-compiler"))
|
||||||
compileOnly(project(":compiler:cli-common"))
|
compileOnly(project(":compiler:cli-common"))
|
||||||
compileOnly(project(":kotlin-reflect"))
|
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
compileOnly(intellijCore())
|
compileOnly(intellijCore())
|
||||||
publishedRuntime(project(":kotlin-compiler"))
|
publishedRuntime(project(":kotlin-compiler"))
|
||||||
publishedRuntime(project(":kotlin-reflect"))
|
publishedRuntime(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ dependencies {
|
|||||||
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||||
|
|
||||||
testRuntimeOnly(project(":kotlin-compiler"))
|
testRuntimeOnly(project(":kotlin-compiler"))
|
||||||
testImplementation(project(":kotlin-reflect"))
|
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
||||||
|
|
||||||
embeddableTestRuntime(project(":kotlin-scripting-jvm-host"))
|
embeddableTestRuntime(project(":kotlin-scripting-jvm-host"))
|
||||||
|
|||||||
@@ -13,11 +13,11 @@ dependencies {
|
|||||||
api(project(":kotlin-scripting-jvm"))
|
api(project(":kotlin-scripting-jvm"))
|
||||||
compileOnly(project(":kotlin-scripting-compiler"))
|
compileOnly(project(":kotlin-scripting-compiler"))
|
||||||
compileOnly(project(":compiler:cli"))
|
compileOnly(project(":compiler:cli"))
|
||||||
compileOnly(project(":kotlin-reflect"))
|
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
compileOnly(intellijCore())
|
compileOnly(intellijCore())
|
||||||
publishedRuntime(project(":kotlin-compiler"))
|
publishedRuntime(project(":kotlin-compiler"))
|
||||||
publishedRuntime(project(":kotlin-scripting-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"))
|
publishedRuntime(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ dependencies {
|
|||||||
compileOnly(project(":kotlin-scripting-dependencies-maven"))
|
compileOnly(project(":kotlin-scripting-dependencies-maven"))
|
||||||
runtimeOnly(project(":kotlin-scripting-compiler-embeddable"))
|
runtimeOnly(project(":kotlin-scripting-compiler-embeddable"))
|
||||||
runtimeOnly(kotlinStdlib())
|
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-common")) { isTransitive = false }
|
||||||
embedded(project(":kotlin-scripting-jvm")) { isTransitive = false }
|
embedded(project(":kotlin-scripting-jvm")) { isTransitive = false }
|
||||||
embedded(project(":kotlin-scripting-jvm-host-unshaded")) { isTransitive = false }
|
embedded(project(":kotlin-scripting-jvm-host-unshaded")) { isTransitive = false }
|
||||||
@@ -46,7 +46,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
proguardLibraryJars(kotlinStdlib())
|
proguardLibraryJars(kotlinStdlib())
|
||||||
proguardLibraryJars(project(":kotlin-reflect"))
|
proguardLibraryJars(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
proguardLibraryJars(project(":kotlin-compiler"))
|
proguardLibraryJars(project(":kotlin-compiler"))
|
||||||
|
|
||||||
relocatedJarContents(embedded)
|
relocatedJarContents(embedded)
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ dependencies {
|
|||||||
testApi(testFixtures(project(":kotlin-project-model")))
|
testApi(testFixtures(project(":kotlin-project-model")))
|
||||||
testApi(project(":kotlin-project-model"))
|
testApi(project(":kotlin-project-model"))
|
||||||
testApi(projectTests(":kotlin-gradle-plugin-integration-tests"))
|
testApi(projectTests(":kotlin-gradle-plugin-integration-tests"))
|
||||||
testCompileOnly(project(":kotlin-reflect"))
|
testCompileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
testImplementation(project(":kotlin-reflect"))
|
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
testImplementation(projectTests(":compiler:test-infrastructure-utils"))
|
testImplementation(projectTests(":compiler:test-infrastructure-utils"))
|
||||||
testImplementation(projectTests(":compiler:test-infrastructure"))
|
testImplementation(projectTests(":compiler:test-infrastructure"))
|
||||||
testImplementation(projectTests(":compiler:tests-common-new"))
|
testImplementation(projectTests(":compiler:tests-common-new"))
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ dependencies {
|
|||||||
testFixturesImplementation(project(":kotlin-tooling-core"))
|
testFixturesImplementation(project(":kotlin-tooling-core"))
|
||||||
testFixturesImplementation(project(":core:util.runtime"))
|
testFixturesImplementation(project(":core:util.runtime"))
|
||||||
testFixturesImplementation(projectTests(":generators:test-generator"))
|
testFixturesImplementation(projectTests(":generators:test-generator"))
|
||||||
testFixturesImplementation(project(":kotlin-reflect"))
|
testFixturesImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
}
|
}
|
||||||
|
|
||||||
projectTest(jUnitMode = JUnitMode.JUnit5) {
|
projectTest(jUnitMode = JUnitMode.JUnit5) {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_11)
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testImplementation(kotlinStdlib())
|
testImplementation(kotlinStdlib())
|
||||||
testImplementation(project(":kotlin-reflect"))
|
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
testImplementation(intellijCore())
|
testImplementation(intellijCore())
|
||||||
testImplementation(commonDependency("commons-lang:commons-lang"))
|
testImplementation(commonDependency("commons-lang:commons-lang"))
|
||||||
testImplementation(commonDependency("org.jetbrains.teamcity:serviceMessages"))
|
testImplementation(commonDependency("org.jetbrains.teamcity:serviceMessages"))
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ dependencies {
|
|||||||
api(project(":kotlin-util-io"))
|
api(project(":kotlin-util-io"))
|
||||||
|
|
||||||
testImplementation(commonDependency("junit:junit"))
|
testImplementation(commonDependency("junit:junit"))
|
||||||
testImplementation(project(":kotlin-reflect"))
|
testImplementation(kotlinStdlib())
|
||||||
|
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -16,14 +16,14 @@ dependencies {
|
|||||||
api(project(":kotlin-scripting-common"))
|
api(project(":kotlin-scripting-common"))
|
||||||
api(project(":kotlin-scripting-jvm"))
|
api(project(":kotlin-scripting-jvm"))
|
||||||
api(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
compileOnly(project(":kotlin-reflect"))
|
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
compileOnly(intellijCore())
|
compileOnly(intellijCore())
|
||||||
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
|
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
|
||||||
|
|
||||||
// FIXME: drop after removing references to LocalFileSystem they don't exist in intellij-core
|
// FIXME: drop after removing references to LocalFileSystem they don't exist in intellij-core
|
||||||
compileOnly(intellijAnalysis())
|
compileOnly(intellijAnalysis())
|
||||||
|
|
||||||
runtimeOnly(project(":kotlin-reflect"))
|
runtimeOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
|
|
||||||
testApi(project(":compiler:frontend"))
|
testApi(project(":compiler:frontend"))
|
||||||
testApi(project(":compiler:plugin-api"))
|
testApi(project(":compiler:plugin-api"))
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ dependencies {
|
|||||||
compileOnly(project(":core:descriptors.runtime"))
|
compileOnly(project(":core:descriptors.runtime"))
|
||||||
compileOnly(project(":compiler:ir.tree"))
|
compileOnly(project(":compiler:ir.tree"))
|
||||||
compileOnly(project(":compiler:backend.jvm.entrypoint"))
|
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-common"))
|
||||||
api(project(":kotlin-scripting-jvm"))
|
api(project(":kotlin-scripting-jvm"))
|
||||||
api(project(":kotlin-scripting-compiler-impl"))
|
api(project(":kotlin-scripting-compiler-impl"))
|
||||||
@@ -33,7 +33,7 @@ dependencies {
|
|||||||
|
|
||||||
testImplementation(intellijCore())
|
testImplementation(intellijCore())
|
||||||
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||||
testImplementation(project(":kotlin-reflect"))
|
testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
}
|
}
|
||||||
|
|
||||||
optInToExperimentalCompilerApi()
|
optInToExperimentalCompilerApi()
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ dependencies {
|
|||||||
|
|
||||||
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core"))
|
||||||
testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core-jvm"))
|
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-psi"))
|
||||||
testImplementation(project(":analysis:decompiled:decompiler-to-file-stubs"))
|
testImplementation(project(":analysis:decompiled:decompiler-to-file-stubs"))
|
||||||
testImplementation(intellijCore())
|
testImplementation(intellijCore())
|
||||||
|
|||||||
@@ -18,11 +18,11 @@ dependencies {
|
|||||||
api(project(":kotlin-scripting-jvm"))
|
api(project(":kotlin-scripting-jvm"))
|
||||||
compileOnly(project(":kotlin-scripting-compiler"))
|
compileOnly(project(":kotlin-scripting-compiler"))
|
||||||
compileOnly(project(":compiler:cli"))
|
compileOnly(project(":compiler:cli"))
|
||||||
compileOnly(project(":kotlin-reflect"))
|
compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
compileOnly(intellijCore())
|
compileOnly(intellijCore())
|
||||||
publishedRuntime(project(":kotlin-compiler"))
|
publishedRuntime(project(":kotlin-compiler"))
|
||||||
publishedRuntime(project(":kotlin-scripting-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"))
|
publishedRuntime(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ val testCompilerClasspath by configurations.creating {
|
|||||||
dependencies {
|
dependencies {
|
||||||
runtimeOnly(kotlinStdlib())
|
runtimeOnly(kotlinStdlib())
|
||||||
runtimeOnly(project(":kotlin-script-runtime"))
|
runtimeOnly(project(":kotlin-script-runtime"))
|
||||||
runtimeOnly(project(":kotlin-reflect"))
|
runtimeOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
runtimeOnly(project(":kotlin-daemon-embeddable"))
|
runtimeOnly(project(":kotlin-daemon-embeddable"))
|
||||||
runtimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
runtimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
||||||
Platform[203].orHigher {
|
Platform[203].orHigher {
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ configurations.all {
|
|||||||
dependencies {
|
dependencies {
|
||||||
api(kotlinStdlib())
|
api(kotlinStdlib())
|
||||||
api(project(":kotlin-script-runtime"))
|
api(project(":kotlin-script-runtime"))
|
||||||
api(project(":kotlin-reflect"))
|
api(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
|
||||||
api(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
api(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
|
||||||
|
|
||||||
proguardLibraries(project(":kotlin-annotations-jvm"))
|
proguardLibraries(project(":kotlin-annotations-jvm"))
|
||||||
|
|||||||
Reference in New Issue
Block a user