Reworked joint build (kotlin + kotlin-ultimate)

- Root buildscript classpath no more depends on buildSrc.jar from kotlin-ultimate. This allows to have stable joint builds - w/o occasional "Unresolved reference" errors in buildscripts.
- kotlin-ultimate modules are now included into Kotlin project when two conditions are met: 1) Gradle parameter 'cidrPluginsEnabled' is turned on; 2) kotlin-ultimate Git repo is checked out right to the Kotlin project root (assuming there is 'kotlin-ultimate' directory inside the project root).
This commit is contained in:
Dmitriy Dolovov
2019-05-21 12:42:08 +03:00
parent db4ba238eb
commit bbdb5e5f0f
4 changed files with 15 additions and 19 deletions
+7 -9
View File
@@ -222,19 +222,17 @@ include ":kotlin-build-common",
":kotlin-serialization-unshaded",
":kotlin-serialization:plugin-marker"
def includeCidr = hasProperty("cidrPluginsEnabled") && Boolean.parseBoolean(cidrPluginsEnabled)
if (includeCidr) {
logger.info("Including :kotlin-ultimate in settings.gradle")
includeBuild "kotlin-ultimate/buildSrc"
def includeCidrPlugins = hasProperty("cidrPluginsEnabled") && Boolean.parseBoolean(cidrPluginsEnabled) && file("kotlin-ultimate").exists()
if (includeCidrPlugins) {
logger.info("Including CIDR plugins in settings.gradle")
include ":kotlin-ultimate:ide:cidr-native",
":kotlin-ultimate:ide:appcode-native",
":kotlin-ultimate:ide:clion-native",
":kotlin-ultimate:ide:appcode-native",
":kotlin-ultimate:prepare:cidr-plugin",
":kotlin-ultimate:prepare:appcode-plugin",
":kotlin-ultimate:prepare:clion-plugin"
":kotlin-ultimate:prepare:clion-plugin",
":kotlin-ultimate:prepare:appcode-plugin"
} else {
logger.info("NOT including :kotlin-ultimate in settings.gradle")
logger.info("NOT including CIDR plugins in settings.gradle")
}
def isTeamcityBuild = hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null