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

Explicit intellijUltimateEnabled should override teamcity build

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-01-20 15:22:02 +03:00
parent 3d1e0c3b39
commit 558a2cb8a8
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+3 -3
View File
@@ -144,9 +144,9 @@ fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)
else v.toBoolean() else v.toBoolean()
} }
val intellijUltimateEnabled = project.getBooleanProperty("intellijUltimateEnabled") val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
?: project.hasProperty("teamcity") val intellijUltimateEnabled = project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild
|| System.getenv("TEAMCITY_VERSION") != null
val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false
extra["intellijUltimateEnabled"] = intellijUltimateEnabled extra["intellijUltimateEnabled"] = intellijUltimateEnabled
buildSrc/build.gradle.kts
+2 -3
View File
@@ -41,9 +41,8 @@ rootProject.apply {
from(rootProject.file("../versions.gradle.kts")) from(rootProject.file("../versions.gradle.kts"))
} }
val intellijUltimateEnabled by extra(project.getBooleanProperty("intellijUltimateEnabled") val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
?: project.hasProperty("teamcity") val intellijUltimateEnabled by extra(project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild)
|| System.getenv("TEAMCITY_VERSION") != null)
val intellijSeparateSdks by extra(project.getBooleanProperty("intellijSeparateSdks") ?: false) val intellijSeparateSdks by extra(project.getBooleanProperty("intellijSeparateSdks") ?: false)
extra["intellijRepo"] = "https://www.jetbrains.com/intellij-repository" extra["intellijRepo"] = "https://www.jetbrains.com/intellij-repository"