Explicit intellijUltimateEnabled should override teamcity build

2018-01-20 15:22:02 +03:00
parent 3d1e0c3b39
commit 558a2cb8a8
2 changed files with 5 additions and 6 deletions
@@ -144,9 +144,9 @@ fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)
    else v.toBoolean()
 }

-val intellijUltimateEnabled = project.getBooleanProperty("intellijUltimateEnabled")
-                              ?: project.hasProperty("teamcity")
-                              || System.getenv("TEAMCITY_VERSION") != null
+val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
+val intellijUltimateEnabled = project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild
+
 val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false

 extra["intellijUltimateEnabled"] = intellijUltimateEnabled