diff --git a/analysis/analysis-api/build.gradle.kts b/analysis/analysis-api/build.gradle.kts index 6d021964071..12ecd5802ef 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-api")) + compileOnly(project(":kotlin-reflect")) compileOnly(project(":compiler:psi")) compileOnly(project(":compiler:frontend")) diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index c379cb351e7..2efd5c65b50 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-api")) + compileOnly(project(":kotlin-reflect")) compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) diff --git a/compiler/cli/cli-common/build.gradle.kts b/compiler/cli/cli-common/build.gradle.kts index 8a752de2609..6d83d75baa7 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-api")) + compileOnly(project(":kotlin-reflect")) compileOnly(intellijCore()) compileOnly(commonDependency("com.google.guava:guava")) compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) 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 92cfac2a75b..055ed1ec4a9 100644 --- a/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts +++ b/compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts @@ -23,8 +23,7 @@ dependencies { testApi(project(":compiler:fir:entrypoint")) testApi(project(":compiler:frontend")) - testCompileOnly(project(":kotlin-reflect-api")) - testRuntimeOnly(project(":kotlin-reflect")) + testImplementation(project(":kotlin-reflect")) testRuntimeOnly(project(":core:descriptors.runtime")) testCompileOnly(intellijCore()) diff --git a/compiler/fir/checkers/build.gradle.kts b/compiler/fir/checkers/build.gradle.kts index 1af04aeac2f..3d2a3d78ebe 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-api")) + compileOnly(project(":kotlin-reflect")) compileOnly(intellijCore()) } diff --git a/compiler/fir/checkers/checkers.native/build.gradle.kts b/compiler/fir/checkers/checkers.native/build.gradle.kts index e4e1f8e1557..2a31a7eba0c 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-api")) + compileOnly(project(":kotlin-reflect")) compileOnly(intellijCore()) } diff --git a/compiler/fir/raw-fir/psi2fir/build.gradle.kts b/compiler/fir/raw-fir/psi2fir/build.gradle.kts index c428235a24e..143d2204435 100644 --- a/compiler/fir/raw-fir/psi2fir/build.gradle.kts +++ b/compiler/fir/raw-fir/psi2fir/build.gradle.kts @@ -20,12 +20,11 @@ dependencies { testImplementation(commonDependency("junit:junit")) testImplementation(projectTests(":compiler:tests-common")) + testImplementation(project(":kotlin-reflect")) testCompileOnly(project(":kotlin-test:kotlin-test-jvm")) testCompileOnly(project(":kotlin-test:kotlin-test-junit")) - testCompileOnly(project(":kotlin-reflect-api")) - testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(project(":core:descriptors.runtime")) testCompileOnly(intellijCore()) diff --git a/compiler/ir/ir.interpreter/build.gradle.kts b/compiler/ir/ir.interpreter/build.gradle.kts index 21ebc6991d2..451b18de1b5 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-api")) + compileOnly(project(":kotlin-reflect")) } sourceSets { diff --git a/compiler/ir/serialization.common/build.gradle.kts b/compiler/ir/serialization.common/build.gradle.kts index 9b604b49ffc..194ea5bae56 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-api")) + compileOnly(project(":kotlin-reflect")) 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 9753671a297..92b0e28a380 100644 --- a/compiler/test-infrastructure-utils/build.gradle.kts +++ b/compiler/test-infrastructure-utils/build.gradle.kts @@ -7,9 +7,8 @@ dependencies { testImplementation(project(":compiler:fir:entrypoint")) testImplementation(project(":compiler:cli")) testImplementation(intellijCore()) + testImplementation(project(":kotlin-reflect")) - testCompileOnly(project(":kotlin-reflect-api")) - testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(project(":core:descriptors.runtime")) // This dependency is needed only for FileComparisonFailure diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index d1a49db0347..89276df2605 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-api")) + testCompileOnly(project(":kotlin-reflect")) testCompileOnly(toolsJar()) testCompileOnly(intellijCore()) diff --git a/generators/test-generator/build.gradle.kts b/generators/test-generator/build.gradle.kts index b35677d937a..e7f8d6ad63e 100644 --- a/generators/test-generator/build.gradle.kts +++ b/generators/test-generator/build.gradle.kts @@ -12,8 +12,7 @@ dependencies { testApiJUnit5() testApi(project(":generators")) - testCompileOnly(project(":kotlin-reflect-api")) - testRuntimeOnly(project(":kotlin-reflect")) + testImplementation(project(":kotlin-reflect")) testRuntimeOnly(project(":core:descriptors.runtime")) } diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts index 79067a789f0..309f31edcd1 100644 --- a/libraries/kotlinx-metadata/jvm/build.gradle.kts +++ b/libraries/kotlinx-metadata/jvm/build.gradle.kts @@ -41,8 +41,7 @@ dependencies { testImplementation(project(":kotlin-test:kotlin-test-junit")) testImplementation(commonDependency("junit:junit")) testImplementation(commonDependency("org.jetbrains.intellij.deps:asm-all")) - testCompileOnly(project(":kotlin-reflect-api")) - testRuntimeOnly(project(":kotlin-reflect")) + testImplementation(project(":kotlin-reflect")) } if (deployVersion != null) { diff --git a/libraries/scripting/common/build.gradle.kts b/libraries/scripting/common/build.gradle.kts index 1eae6d530dd..f0cdf39717c 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-api")) + compileOnly(project(":kotlin-reflect")) testApi(commonDependency("junit")) } diff --git a/libraries/scripting/jsr223/build.gradle.kts b/libraries/scripting/jsr223/build.gradle.kts index 67b6d1b3e2d..7baaac82b18 100644 --- a/libraries/scripting/jsr223/build.gradle.kts +++ b/libraries/scripting/jsr223/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { api(project(":kotlin-scripting-jvm-host-unshaded")) api(project(":kotlin-scripting-compiler")) compileOnly(project(":compiler:cli-common")) - compileOnly(project(":kotlin-reflect-api")) + compileOnly(project(":kotlin-reflect")) compileOnly(intellijCore()) publishedRuntime(project(":kotlin-compiler")) publishedRuntime(project(":kotlin-reflect")) diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts index 8d267c41c41..ff78e1a6466 100644 --- a/libraries/scripting/jvm-host/build.gradle.kts +++ b/libraries/scripting/jvm-host/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { api(project(":kotlin-scripting-jvm")) compileOnly(project(":kotlin-scripting-compiler")) compileOnly(project(":compiler:cli")) - compileOnly(project(":kotlin-reflect-api")) + compileOnly(project(":kotlin-reflect")) compileOnly(intellijCore()) publishedRuntime(project(":kotlin-compiler")) publishedRuntime(project(":kotlin-scripting-compiler")) 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 8c8fbeca467..9669d879634 100644 --- a/libraries/tools/kotlin-project-model-tests-generator/build.gradle.kts +++ b/libraries/tools/kotlin-project-model-tests-generator/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { testApi(testFixtures(project(":kotlin-project-model"))) testApi(project(":kotlin-project-model")) testApi(projectTests(":kotlin-gradle-plugin-integration-tests")) - testCompileOnly(project(":kotlin-reflect-api")) + testCompileOnly(project(":kotlin-reflect")) testImplementation(project(":kotlin-reflect")) testImplementation(projectTests(":compiler:test-infrastructure-utils")) testImplementation(projectTests(":compiler:test-infrastructure")) diff --git a/plugins/scripting/scripting-compiler-impl/build.gradle.kts b/plugins/scripting/scripting-compiler-impl/build.gradle.kts index 26f6d7a5d45..1b43d9b058d 100644 --- a/plugins/scripting/scripting-compiler-impl/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-impl/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { api(project(":kotlin-scripting-common")) api(project(":kotlin-scripting-jvm")) api(kotlinStdlib()) - compileOnly(project(":kotlin-reflect-api")) + compileOnly(project(":kotlin-reflect")) compileOnly(intellijCore()) compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) diff --git a/plugins/scripting/scripting-compiler/build.gradle.kts b/plugins/scripting/scripting-compiler/build.gradle.kts index 2ca96745d8c..c6e7a019906 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-api")) + compileOnly(project(":kotlin-reflect")) api(project(":kotlin-scripting-common")) api(project(":kotlin-scripting-jvm")) api(project(":kotlin-scripting-compiler-impl")) diff --git a/plugins/scripting/scripting-ide-services/build.gradle.kts b/plugins/scripting/scripting-ide-services/build.gradle.kts index c9671dd7146..8b3b53df9c0 100644 --- a/plugins/scripting/scripting-ide-services/build.gradle.kts +++ b/plugins/scripting/scripting-ide-services/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { api(project(":kotlin-scripting-jvm")) compileOnly(project(":kotlin-scripting-compiler")) compileOnly(project(":compiler:cli")) - compileOnly(project(":kotlin-reflect-api")) + compileOnly(project(":kotlin-reflect")) compileOnly(intellijCore()) publishedRuntime(project(":kotlin-compiler")) publishedRuntime(project(":kotlin-scripting-compiler"))