From 156ecce961825b358864885234355b6e14d1882c Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Sat, 27 Nov 2021 04:22:46 +0300 Subject: [PATCH] Build: Fix unconditional adding kotlin-reflect.jar for JPS build Should be added only when JPS build enabled to avoid kotlin-reflect reindexing after each build --- compiler/tests-java8/build.gradle.kts | 5 ++++- compiler/tests-spec/build.gradle.kts | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts index 7a4c1ae19f9..ed671288e33 100644 --- a/compiler/tests-java8/build.gradle.kts +++ b/compiler/tests-java8/build.gradle.kts @@ -12,8 +12,11 @@ dependencies { testApi(projectTests(":generators:test-generator")) testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(toolsJar()) + testRuntimeOnly(intellijPluginDep("java")) - if (isIdeaActive) testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar")) + + if (kotlinBuildProperties.isInJpsBuildIdeaSync) + testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar")) } sourceSets { diff --git a/compiler/tests-spec/build.gradle.kts b/compiler/tests-spec/build.gradle.kts index c0010ae1b3e..1a56bda8f11 100644 --- a/compiler/tests-spec/build.gradle.kts +++ b/compiler/tests-spec/build.gradle.kts @@ -18,7 +18,11 @@ dependencies { testRuntimeOnly(intellijPluginDep("java")) api("org.jsoup:jsoup:1.14.2") - if (isIdeaActive) testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar")) + + if (kotlinBuildProperties.isInJpsBuildIdeaSync) { + testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar")) + } + testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(project(":core:descriptors.runtime"))