Build: support local.properties for JPS build. Apply JPS related tweaks only inside IDEA import.

2019-03-27 16:06:48 +03:00
parent 5802928e52
commit fb3f28974e
13 changed files with 116 additions and 26 deletions
@@ -219,8 +219,9 @@ if (isTeamcityBuild || includeUltimate) {
    )
 }

-def isJpsBuild = hasProperty("jpsBuild") && jpsBuild == 'true'
-if (isJpsBuild) {
+def flags = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings)
+
+if (flags.inJpsBuildIdeaSync) {
    include ":kotlin-stdlib:jps-build"
    project(":kotlin-stdlib:jps-build").projectDir = "$rootDir/libraries/stdlib/jps-build" as File
 } else {