azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Fix unconditional adding kotlin-reflect.jar for JPS build

Browse Source 
Should be added only when JPS build enabled to avoid kotlin-reflect
reindexing after each build
This commit is contained in:
Vyacheslav Gerasimov
2021-11-27 04:22:46 +03:00
committed by teamcity
parent 8c71e38c92
commit 156ecce961
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-java8/build.gradle.kts
+4 -1
View File
@@ -12,8 +12,11 @@ dependencies {
testApi(projectTests(":generators:test-generator")) testApi(projectTests(":generators:test-generator"))
testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(project(":kotlin-reflect"))
testRuntimeOnly(toolsJar()) testRuntimeOnly(toolsJar())
testRuntimeOnly(intellijPluginDep("java")) 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 { sourceSets {
compiler/tests-spec/build.gradle.kts
+5 -1
View File
@@ -18,7 +18,11 @@ dependencies {
testRuntimeOnly(intellijPluginDep("java")) testRuntimeOnly(intellijPluginDep("java"))
api("org.jsoup:jsoup:1.14.2") 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(":kotlin-reflect"))
testRuntimeOnly(project(":core:descriptors.runtime")) testRuntimeOnly(project(":core:descriptors.runtime"))