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

Add cocoa binary dependencies

Browse Source
This commit is contained in:
Kirill Shmakov
2019-12-24 18:40:19 +03:00
parent 9e8f21cc20
commit 4554f91aff
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/settings.gradle
+11 -2
View File
@@ -25,18 +25,27 @@ buildscript {
} }
def buildProperties = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings) def buildProperties = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings)
def projectVersions = file("../gradle/versions.properties").text
BuildCacheKt.setupBuildCache(settings) BuildCacheKt.setupBuildCache(settings)
include "prepare-deps" include "prepare-deps"
if (buildProperties.includeCidrPlugins) { 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" include ":prepare-deps:kotlin-native-platform-deps"
project(":prepare-deps:kotlin-native-platform-deps").projectDir = project(":prepare-deps:kotlin-native-platform-deps").projectDir =
file("${buildProperties.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/kotlin-native-platform-deps") 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 { } else {
logger.info("NOT including CIDR plugins in buildSrc/settings.gradle") logger.info("NOT including CIDR modules in buildSrc/settings.gradle")
} }
if (buildProperties.includeUltimate) { if (buildProperties.includeUltimate) {
settings.gradle
+12 -5
View File
@@ -36,6 +36,7 @@ plugins {
} }
def buildProperties = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings) def buildProperties = BuildPropertiesKt.getKotlinBuildPropertiesForSettings(settings)
def projectVersions = file("./gradle/versions.properties").text
gradleEnterprise { gradleEnterprise {
buildScan { buildScan {
@@ -284,20 +285,26 @@ include ":kotlin-build-common",
":kotlin-serialization:plugin-marker" ":kotlin-serialization:plugin-marker"
if (buildProperties.includeCidrPlugins) { 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", include ":kotlin-ultimate:ide:cidr-gradle-tooling",
":kotlin-ultimate:ide:common-native", ":kotlin-ultimate:ide:common-native",
":kotlin-ultimate:ide:common-cidr-native", ":kotlin-ultimate:ide:common-cidr-native",
":kotlin-ultimate:ide:common-noncidr-native", ":kotlin-ultimate:ide:common-noncidr-native",
":kotlin-ultimate:ide:clion-native", ":kotlin-ultimate:ide:clion-native",
":kotlin-ultimate:ide:appcode-native", ":kotlin-ultimate:ide:appcode-native",
":kotlin-ultimate:ide:android-studio-native",
":kotlin-ultimate:prepare:cidr-plugin", ":kotlin-ultimate:prepare:cidr-plugin",
":kotlin-ultimate:prepare:clion-plugin", ":kotlin-ultimate:prepare:clion-plugin",
":kotlin-ultimate:prepare:appcode-plugin", ":kotlin-ultimate:prepare:appcode-plugin"
":kotlin-ultimate:prepare:mobile-mpp-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 { } else {
logger.info("NOT including CIDR plugins in settings.gradle") logger.info("NOT including CIDR modules in settings.gradle")
} }
if (buildProperties.includeUltimate) { if (buildProperties.includeUltimate) {