From 57ce178bb327a47de3a4fc5e8d2a44f089c3fc81 Mon Sep 17 00:00:00 2001 From: Viacheslav Kormushkin Date: Mon, 11 Oct 2021 12:03:51 +0000 Subject: [PATCH] Build with CocoaPods plugin fails if `CONFIGRATION` contains spaces #KT-48771 Merge-request: KT-MR-4724 --- .../kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt | 4 ++-- .../kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt index fc5c9d4bbbb..24fa8d57cd3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt @@ -1492,7 +1492,7 @@ class CocoaPodsIT : BaseGradleIT() { "${'$'}REPO_ROOT/../gradlew" -p "${'$'}REPO_ROOT" ${'$'}KOTLIN_PROJECT_PATH:syncFramework \ -Pkotlin.native.cocoapods.platform=${'$'}PLATFORM_NAME \ -Pkotlin.native.cocoapods.archs="${'$'}ARCHS" \ - -Pkotlin.native.cocoapods.configuration=${'$'}CONFIGURATION + -Pkotlin.native.cocoapods.configuration="${'$'}CONFIGURATION" SCRIPT } ] @@ -1529,7 +1529,7 @@ class CocoaPodsIT : BaseGradleIT() { "${'$'}REPO_ROOT/../gradlew" -p "${'$'}REPO_ROOT" ${'$'}KOTLIN_PROJECT_PATH:syncFramework \ -Pkotlin.native.cocoapods.platform=${'$'}PLATFORM_NAME \ -Pkotlin.native.cocoapods.archs="${'$'}ARCHS" \ - -Pkotlin.native.cocoapods.configuration=${'$'}CONFIGURATION + -Pkotlin.native.cocoapods.configuration="${'$'}CONFIGURATION" SCRIPT } ] diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt index 2537f146358..f1048213863 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt @@ -160,7 +160,7 @@ open class PodspecTask : DefaultTask() { | "$gradleCommand" -p "${'$'}REPO_ROOT" ${'$'}KOTLIN_PROJECT_PATH:$SYNC_TASK_NAME \ | -P${KotlinCocoapodsPlugin.PLATFORM_PROPERTY}=${'$'}PLATFORM_NAME \ | -P${KotlinCocoapodsPlugin.ARCHS_PROPERTY}="${'$'}ARCHS" \ - | -P${KotlinCocoapodsPlugin.CONFIGURATION_PROPERTY}=${'$'}CONFIGURATION + | -P${KotlinCocoapodsPlugin.CONFIGURATION_PROPERTY}="${'$'}CONFIGURATION" | SCRIPT | } | ]