From 558a2cb8a89a8016c421ba82f23a7809bc5405da Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Sat, 20 Jan 2018 15:22:02 +0300 Subject: [PATCH] Explicit intellijUltimateEnabled should override teamcity build --- build.gradle.kts | 6 +++--- buildSrc/build.gradle.kts | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f22c545722d..c318bfa3ef8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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 diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 28bdc65f49a..9dbc2f5a8ed 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -41,9 +41,8 @@ rootProject.apply { from(rootProject.file("../versions.gradle.kts")) } -val intellijUltimateEnabled by extra(project.getBooleanProperty("intellijUltimateEnabled") - ?: project.hasProperty("teamcity") - || System.getenv("TEAMCITY_VERSION") != null) +val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null +val intellijUltimateEnabled by extra(project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild) val intellijSeparateSdks by extra(project.getBooleanProperty("intellijSeparateSdks") ?: false) extra["intellijRepo"] = "https://www.jetbrains.com/intellij-repository"