From 07e3dd9ec75f0a2cfe43808cb88f65ca18efbad6 Mon Sep 17 00:00:00 2001 From: Yaroslav Chernyshev Date: Mon, 13 Jul 2020 16:36:46 +0300 Subject: [PATCH] [Gradle, Cocoapods] Fixed bug in `scheme` name for pods --- .../gradle/targets/native/tasks/AdvancedCocoapodsTasks.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/AdvancedCocoapodsTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/AdvancedCocoapodsTasks.kt index 95e7e0d15a8..de7c394d0f2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/AdvancedCocoapodsTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/AdvancedCocoapodsTasks.kt @@ -233,6 +233,9 @@ open class PodBuildTask : CocoapodsWithSyntheticTask() { @get:OutputDirectory internal var buildDirProvider: Provider? = null + private val CocoapodsExtension.CocoapodsDependency.schemeName: String + get() = name.split("/")[0] + @TaskAction fun buildDependencies() { val podBuildSettings = PodBuildSettingsProperties.readSettingsFromStream( @@ -246,7 +249,7 @@ open class PodBuildTask : CocoapodsWithSyntheticTask() { val podXcodeBuildCommand = listOf( "xcodebuild", "-project", podsXcodeProjDir.name, - "-scheme", it.moduleName, + "-scheme", it.schemeName, "-sdk", kotlinNativeTarget.toValidSDK, "-configuration", podBuildSettings.configuration )