From ca9bff010b3bd64e872b0e745f60d3e3e9963ddc Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Wed, 8 May 2019 14:09:32 +0300 Subject: [PATCH] Fix: Make "cidrPluginsEnabled" Gradle parameter checks consistent Also add logging. --- build.gradle.kts | 6 +++++- settings.gradle | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5f3cc13492c..2af59c8490a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,8 +31,12 @@ buildscript { classpath("org.jetbrains.dokka:dokka-gradle-plugin:0.9.17") // a workaround to add another one buildSrc with Cidr-specific tools to Gradle classpath + val kotlinUltimateBuildSrcDep = "org.jetbrains.kotlin.ultimate:buildSrc:1.0" if (findProperty("cidrPluginsEnabled")?.toString()?.toBoolean() == true) { - classpath("org.jetbrains.kotlin.ultimate:buildSrc:1.0") + logger.info("Adding buildscript classpath dependency \"$kotlinUltimateBuildSrcDep\" in build.gradle.kts") + classpath(kotlinUltimateBuildSrcDep) + } else { + logger.info("NOT adding buildscript classpath dependency \"$kotlinUltimateBuildSrcDep\" in build.gradle.kts") } } } diff --git a/settings.gradle b/settings.gradle index 200edaa64a2..4409869e99e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -204,8 +204,9 @@ include ":kotlin-build-common", ":kotlin-serialization-unshaded" -def includeCidr = hasProperty("cidrPluginsEnabled") && cidrPluginsEnabled != 'false' +def includeCidr = hasProperty("cidrPluginsEnabled") && Boolean.parseBoolean(cidrPluginsEnabled) if (includeCidr) { + logger.info("Including :kotlin-ultimate in settings.gradle") includeBuild "kotlin-ultimate/buildSrc" include ":kotlin-ultimate:ide:cidr-native", ":kotlin-ultimate:ide:appcode-native", @@ -213,6 +214,8 @@ if (includeCidr) { ":kotlin-ultimate:prepare:cidr-plugin", ":kotlin-ultimate:prepare:appcode-plugin", ":kotlin-ultimate:prepare:clion-plugin" +} else { + logger.info("NOT including :kotlin-ultimate in settings.gradle") } def isTeamcityBuild = hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null