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

Use same models in MPP and CIDR

Browse Source
This commit is contained in:
Kirill Shmakov
2019-07-15 14:46:19 +03:00
parent 2cc6bf31e0
commit 407e5a5270
10 changed files with 170 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
settings.gradle
+7 -7
View File
@@ -226,7 +226,8 @@ def flags = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings)
if (flags.includeCidrPlugins) {
logger.info("Including CIDR plugins in settings.gradle")
include ":kotlin-ultimate:ide:cidr-native",
include ":kotlin-ultimate:ide:common-native",
":kotlin-ultimate:ide:cidr-native",
":kotlin-ultimate:ide:clion-native",
":kotlin-ultimate:ide:appcode-native",
":kotlin-ultimate:prepare:cidr-plugin",
@@ -236,12 +237,11 @@ if (flags.includeCidrPlugins) {
logger.info("NOT including CIDR plugins in settings.gradle")
}
def isTeamcityBuild = hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
if (flags.kotlinUltimateExists && (isTeamcityBuild || flags.intellijUltimateEnabled)) {
include(
":kotlin-ultimate:ultimate",
":kotlin-ultimate:ultimate:ultimate-runner"
)
if (flags.includeUltimate) {
include ":kotlin-ultimate:ultimate",
":kotlin-ultimate:ultimate:ultimate-runner",
":kotlin-ultimate:ide:common-native",
":kotlin-ultimate:ide:ultimate-native"
logger.info("Including extension for IJ Ultimate in settings.gradle")
} else {
logger.info("NOT including extension for IJ Ultimate in settings.gradle")