diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle index 8771c8eb524..d0c74e91a3b 100644 --- a/buildSrc/settings.gradle +++ b/buildSrc/settings.gradle @@ -25,18 +25,27 @@ buildscript { } def buildProperties = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings) +def projectVersions = file("../gradle/versions.properties").text BuildCacheKt.setupBuildCache(settings) include "prepare-deps" if (buildProperties.includeCidrPlugins) { - logger.info("Including CIDR plugins in buildSrc/settings.gradle") + logger.info("Including CIDR modules in buildSrc/settings.gradle") include ":prepare-deps:kotlin-native-platform-deps" project(":prepare-deps:kotlin-native-platform-deps").projectDir = file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/kotlin-native-platform-deps") + if (projectVersions.contains("versions.androidStudioRelease")) { + logger.info("Including Mobile MPP modules in buildSrc/settings.gradle") + include ":prepare-deps:cocoa-common-binaries" + project(":prepare-deps:cocoa-common-binaries").projectDir = + file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/cocoa-common-binaries") + } else { + logger.info("NOT including Mobile MPP modules in buildSrc/settings.gradle") + } } else { - logger.info("NOT including CIDR plugins in buildSrc/settings.gradle") + logger.info("NOT including CIDR modules in buildSrc/settings.gradle") } if (buildProperties.includeUltimate) { diff --git a/settings.gradle b/settings.gradle index 0515bcda76b..7a6af76056e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -36,6 +36,7 @@ plugins { } def buildProperties = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings) +def projectVersions = file("./gradle/versions.properties").text gradleEnterprise { buildScan { @@ -284,20 +285,26 @@ include ":kotlin-build-common", ":kotlin-serialization:plugin-marker" if (buildProperties.includeCidrPlugins) { - logger.info("Including CIDR plugins in settings.gradle") + logger.info("Including CIDR modules in settings.gradle") include ":kotlin-ultimate:ide:cidr-gradle-tooling", ":kotlin-ultimate:ide:common-native", ":kotlin-ultimate:ide:common-cidr-native", ":kotlin-ultimate:ide:common-noncidr-native", ":kotlin-ultimate:ide:clion-native", ":kotlin-ultimate:ide:appcode-native", - ":kotlin-ultimate:ide:android-studio-native", ":kotlin-ultimate:prepare:cidr-plugin", ":kotlin-ultimate:prepare:clion-plugin", - ":kotlin-ultimate:prepare:appcode-plugin", - ":kotlin-ultimate:prepare:mobile-mpp-plugin" + ":kotlin-ultimate:prepare:appcode-plugin" + + if (projectVersions.contains("versions.androidStudioRelease")) { + logger.info("Including Mobile MPP modules in settings.gradle") + include ":kotlin-ultimate:ide:android-studio-native", + ":kotlin-ultimate:prepare:mobile-mpp-plugin" + } else { + logger.info("NOT including Mobile MPP modules in settings.gradle") + } } else { - logger.info("NOT including CIDR plugins in settings.gradle") + logger.info("NOT including CIDR modules in settings.gradle") } if (buildProperties.includeUltimate) {