diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts b/analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts index ed59875b1f1..d2c69e82c98 100644 --- a/analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { implementation(project(":compiler:fir:checkers:checkers-component-generator")) 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 diff --git a/analysis/analysis-api-impl-base/build.gradle.kts b/analysis/analysis-api-impl-base/build.gradle.kts index de6646ea013..f86069f229b 100644 --- a/analysis/analysis-api-impl-base/build.gradle.kts +++ b/analysis/analysis-api-impl-base/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { testApi(project(":analysis:decompiled:decompiler-to-file-stubs")) testApi(project(":analysis:decompiled:decompiler-to-psi")) testApi(projectTests(":analysis:analysis-test-framework")) - testImplementation(project(":kotlin-reflect")) + testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } testImplementation(toolsJar()) } diff --git a/analysis/analysis-api/build.gradle.kts b/analysis/analysis-api/build.gradle.kts index 12ecd5802ef..37ddb4f060c 100644 --- a/analysis/analysis-api/build.gradle.kts +++ b/analysis/analysis-api/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { dependencies { implementation(kotlinxCollectionsImmutable()) - compileOnly(project(":kotlin-reflect")) + compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } compileOnly(project(":compiler:psi")) compileOnly(project(":compiler:frontend")) diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index 2efd5c65b50..a304036d665 100644 --- a/build-common/build.gradle.kts +++ b/build-common/build.gradle.kts @@ -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")) + compileOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) @@ -25,7 +25,7 @@ dependencies { testApi(commonDependency("junit:junit")) testApi(protobufFull()) testApi(kotlinStdlib()) - testImplementation(project(":kotlin-reflect")) + testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } } sourceSets { diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 4d2ce39f6bd..bf254984ab8 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -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")) diff --git a/compiler/cli/cli-common/build.gradle.kts b/compiler/cli/cli-common/build.gradle.kts index 6d83d75baa7..9fd7ae56c88 100644 --- a/compiler/cli/cli-common/build.gradle.kts +++ b/compiler/cli/cli-common/build.gradle.kts @@ -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")) diff --git a/compiler/daemon/build.gradle.kts b/compiler/daemon/build.gradle.kts index addbbfd7a61..9d0f4f80b94 100644 --- a/compiler/daemon/build.gradle.kts +++ b/compiler/daemon/build.gradle.kts @@ -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")) { diff --git a/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts b/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts index 055ed1ec4a9..d6fc16978e2 100644 --- a/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts +++ b/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts @@ -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()) diff --git a/compiler/fir/checkers/build.gradle.kts b/compiler/fir/checkers/build.gradle.kts index 3d2a3d78ebe..0def8b1d5a1 100644 --- a/compiler/fir/checkers/build.gradle.kts +++ b/compiler/fir/checkers/build.gradle.kts @@ -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()) } diff --git a/compiler/fir/checkers/checkers-component-generator/build.gradle.kts b/compiler/fir/checkers/checkers-component-generator/build.gradle.kts index 78cff85696d..d4008f38b61 100644 --- a/compiler/fir/checkers/checkers-component-generator/build.gradle.kts +++ b/compiler/fir/checkers/checkers-component-generator/build.gradle.kts @@ -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 diff --git a/compiler/fir/checkers/checkers.native/build.gradle.kts b/compiler/fir/checkers/checkers.native/build.gradle.kts index 2a31a7eba0c..126a184b469 100644 --- a/compiler/fir/checkers/checkers.native/build.gradle.kts +++ b/compiler/fir/checkers/checkers.native/build.gradle.kts @@ -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()) } diff --git a/compiler/fir/raw-fir/psi2fir/build.gradle.kts b/compiler/fir/raw-fir/psi2fir/build.gradle.kts index 143d2204435..7d4985862ed 100644 --- a/compiler/fir/raw-fir/psi2fir/build.gradle.kts +++ b/compiler/fir/raw-fir/psi2fir/build.gradle.kts @@ -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")) diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts index 27dd4092ee9..4e6a9fda3b0 100644 --- a/compiler/incremental-compilation-impl/build.gradle.kts +++ b/compiler/incremental-compilation-impl/build.gradle.kts @@ -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")) } diff --git a/compiler/ir/ir.interpreter/build.gradle.kts b/compiler/ir/ir.interpreter/build.gradle.kts index 451b18de1b5..c40adcc83db 100644 --- a/compiler/ir/ir.interpreter/build.gradle.kts +++ b/compiler/ir/ir.interpreter/build.gradle.kts @@ -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 { diff --git a/compiler/ir/serialization.common/build.gradle.kts b/compiler/ir/serialization.common/build.gradle.kts index 194ea5bae56..59c082381c2 100644 --- a/compiler/ir/serialization.common/build.gradle.kts +++ b/compiler/ir/serialization.common/build.gradle.kts @@ -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")) diff --git a/compiler/test-infrastructure-utils/build.gradle.kts b/compiler/test-infrastructure-utils/build.gradle.kts index 92b0e28a380..71974c95d99 100644 --- a/compiler/test-infrastructure-utils/build.gradle.kts +++ b/compiler/test-infrastructure-utils/build.gradle.kts @@ -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")) diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 89276df2605..17e3e7755d3 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -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()) diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index 5b228f4c325..5a7e7f38261 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -71,7 +71,7 @@ dependencies { testApi(projectTests(":plugins:fir-plugin-prototype")) testApi(projectTests(":plugins:fir-plugin-prototype:fir-plugin-ic-test")) 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")) testImplementation(projectTests(":compiler:tests-common-new")) diff --git a/generators/test-generator/build.gradle.kts b/generators/test-generator/build.gradle.kts index e7f8d6ad63e..20b23214318 100644 --- a/generators/test-generator/build.gradle.kts +++ b/generators/test-generator/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { testApiJUnit5() testApi(project(":generators")) - testImplementation(project(":kotlin-reflect")) + testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } testRuntimeOnly(project(":core:descriptors.runtime")) } diff --git a/kotlin-native/Interop/Runtime/build.gradle.kts b/kotlin-native/Interop/Runtime/build.gradle.kts index a525099a086..1471b3a20f2 100644 --- a/kotlin-native/Interop/Runtime/build.gradle.kts +++ b/kotlin-native/Interop/Runtime/build.gradle.kts @@ -66,7 +66,7 @@ native { dependencies { implementation(project(":kotlin-native:utilities:basic-utils")) 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") diff --git a/kotlin-native/backend.native/build.gradle b/kotlin-native/backend.native/build.gradle index a9b57268d2f..9e6398954ee 100644 --- a/kotlin-native/backend.native/build.gradle +++ b/kotlin-native/backend.native/build.gradle @@ -107,7 +107,9 @@ dependencies { trove4j_jar "org.jetbrains.intellij.deps:trove4j:1.0.20181211@jar" kotlin_compiler_jar project(kotlinCompilerModule) 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") compilerApi project(":kotlin-native:utilities:basic-utils") diff --git a/kotlin-native/build-tools/build.gradle.kts b/kotlin-native/build-tools/build.gradle.kts index 73af8ee28af..765b13765d2 100644 --- a/kotlin-native/build-tools/build.gradle.kts +++ b/kotlin-native/build-tools/build.gradle.kts @@ -60,7 +60,7 @@ dependencies { commonApi(project(":kotlin-gradle-plugin")) commonApi(project(":kotlin-gradle-plugin-api")) 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("com.ullink.slack:simpleslackapi:$slackApiVersion") { diff --git a/kotlin-native/shared/build.gradle.kts b/kotlin-native/shared/build.gradle.kts index cca077ac9c9..90d137923a4 100644 --- a/kotlin-native/shared/build.gradle.kts +++ b/kotlin-native/shared/build.gradle.kts @@ -52,7 +52,7 @@ dependencies { kotlinCompilerClasspath("org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion") 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-util-klib:$kotlinVersion") } diff --git a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts index 013a1befd9f..24b1b68d197 100644 --- a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts +++ b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts @@ -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")) diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts index 309f31edcd1..ce7f0f73894 100644 --- a/libraries/kotlinx-metadata/jvm/build.gradle.kts +++ b/libraries/kotlinx-metadata/jvm/build.gradle.kts @@ -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) { diff --git a/libraries/scripting/common/build.gradle.kts b/libraries/scripting/common/build.gradle.kts index f0cdf39717c..ddabe603dfb 100644 --- a/libraries/scripting/common/build.gradle.kts +++ b/libraries/scripting/common/build.gradle.kts @@ -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")) } diff --git a/libraries/scripting/dependencies-maven/build.gradle.kts b/libraries/scripting/dependencies-maven/build.gradle.kts index d50679ad651..693157c4674 100644 --- a/libraries/scripting/dependencies-maven/build.gradle.kts +++ b/libraries/scripting/dependencies-maven/build.gradle.kts @@ -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")) } diff --git a/libraries/scripting/jsr223/build.gradle.kts b/libraries/scripting/jsr223/build.gradle.kts index 7baaac82b18..fc39d7993a8 100644 --- a/libraries/scripting/jsr223/build.gradle.kts +++ b/libraries/scripting/jsr223/build.gradle.kts @@ -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 { diff --git a/libraries/scripting/jvm-host-test/build.gradle.kts b/libraries/scripting/jvm-host-test/build.gradle.kts index 4c4c3795092..1273bf177f9 100644 --- a/libraries/scripting/jvm-host-test/build.gradle.kts +++ b/libraries/scripting/jvm-host-test/build.gradle.kts @@ -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")) diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts index ff78e1a6466..4245e0a3d59 100644 --- a/libraries/scripting/jvm-host/build.gradle.kts +++ b/libraries/scripting/jvm-host/build.gradle.kts @@ -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")) } diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts index 1ac4de07d13..374f218497e 100644 --- a/libraries/tools/kotlin-main-kts/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts/build.gradle.kts @@ -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) diff --git a/libraries/tools/kotlin-project-model-tests-generator/build.gradle.kts b/libraries/tools/kotlin-project-model-tests-generator/build.gradle.kts index 9669d879634..be462851aff 100644 --- a/libraries/tools/kotlin-project-model-tests-generator/build.gradle.kts +++ b/libraries/tools/kotlin-project-model-tests-generator/build.gradle.kts @@ -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")) diff --git a/libraries/tools/kotlin-project-model/build.gradle.kts b/libraries/tools/kotlin-project-model/build.gradle.kts index a0ca56f214c..e2c808af4bd 100644 --- a/libraries/tools/kotlin-project-model/build.gradle.kts +++ b/libraries/tools/kotlin-project-model/build.gradle.kts @@ -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) { diff --git a/native/native.tests/build.gradle.kts b/native/native.tests/build.gradle.kts index 12d55d747ae..1c078c16815 100644 --- a/native/native.tests/build.gradle.kts +++ b/native/native.tests/build.gradle.kts @@ -9,7 +9,7 @@ project.configureJvmToolchain(JdkMajorVersion.JDK_11) dependencies { testImplementation(kotlinStdlib()) - testImplementation(project(":kotlin-reflect")) + testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } testImplementation(intellijCore()) testImplementation(commonDependency("commons-lang:commons-lang")) testImplementation(commonDependency("org.jetbrains.teamcity:serviceMessages")) diff --git a/native/utils/build.gradle.kts b/native/utils/build.gradle.kts index 3c3372f688d..e46a8b494e3 100644 --- a/native/utils/build.gradle.kts +++ b/native/utils/build.gradle.kts @@ -10,7 +10,8 @@ dependencies { api(project(":kotlin-util-io")) testImplementation(commonDependency("junit:junit")) - testImplementation(project(":kotlin-reflect")) + testImplementation(kotlinStdlib()) + testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } } sourceSets { diff --git a/plugins/scripting/scripting-compiler-impl/build.gradle.kts b/plugins/scripting/scripting-compiler-impl/build.gradle.kts index 1b43d9b058d..b8896c881c3 100644 --- a/plugins/scripting/scripting-compiler-impl/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-impl/build.gradle.kts @@ -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")) diff --git a/plugins/scripting/scripting-compiler/build.gradle.kts b/plugins/scripting/scripting-compiler/build.gradle.kts index c6e7a019906..40d3aade40c 100644 --- a/plugins/scripting/scripting-compiler/build.gradle.kts +++ b/plugins/scripting/scripting-compiler/build.gradle.kts @@ -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() diff --git a/plugins/scripting/scripting-ide-services-test/build.gradle.kts b/plugins/scripting/scripting-ide-services-test/build.gradle.kts index 85465d2b79d..88533865f2f 100644 --- a/plugins/scripting/scripting-ide-services-test/build.gradle.kts +++ b/plugins/scripting/scripting-ide-services-test/build.gradle.kts @@ -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()) diff --git a/plugins/scripting/scripting-ide-services/build.gradle.kts b/plugins/scripting/scripting-ide-services/build.gradle.kts index 8b3b53df9c0..583855cf53a 100644 --- a/plugins/scripting/scripting-ide-services/build.gradle.kts +++ b/plugins/scripting/scripting-ide-services/build.gradle.kts @@ -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")) } diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts index 26882eec2d5..153c3ca7c17 100644 --- a/prepare/compiler-embeddable/build.gradle.kts +++ b/prepare/compiler-embeddable/build.gradle.kts @@ -24,7 +24,7 @@ val testCompilerClasspath by configurations.creating { dependencies { runtimeOnly(kotlinStdlib()) runtimeOnly(project(":kotlin-script-runtime")) - runtimeOnly(project(":kotlin-reflect")) + runtimeOnly(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } runtimeOnly(project(":kotlin-daemon-embeddable")) runtimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j")) Platform[203].orHigher { diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index fbcac17374f..d258a14e4f7 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -137,7 +137,7 @@ configurations.all { dependencies { api(kotlinStdlib()) 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")) proguardLibraries(project(":kotlin-annotations-jvm"))