From 9fa55a6809ce3cf4f52dc5207d80b845ee770909 Mon Sep 17 00:00:00 2001 From: Viacheslav Kormushkin Date: Sun, 20 Jun 2021 15:28:31 +0300 Subject: [PATCH] Fixed cocoapods error: expected ';' after module name #KT-44235 --- .../kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt | 4 +--- .../gradle/targets/native/cocoapods/CocoapodsExtension.kt | 2 +- 2 files changed, 2 insertions(+), 4 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 f7d3652ab63..61bc3fc3d55 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 @@ -697,9 +697,7 @@ class CocoaPodsIT : BaseGradleIT() { with(project.gradleBuildScript()) { addPod( podName, - """source = url("$repo", $flatten) - |moduleName = "Pod_with_dashes" - """.trimMargin() + "source = url(\"$repo\", $flatten)" ) } hooks.addHook { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/CocoapodsExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/CocoapodsExtension.kt index 99e8da2e6fb..2f766afe213 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/CocoapodsExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/cocoapods/CocoapodsExtension.kt @@ -199,7 +199,7 @@ open class CocoapodsExtension(private val project: Project) { // Empty string will lead to an attempt to create two podDownload tasks. // One is original podDownload and second is podDownload + pod.name require(name.isNotEmpty()) { "Please provide not empty pod name to avoid ambiguity" } - val dependency = CocoapodsDependency(name, name.split("/")[0]) + val dependency = CocoapodsDependency(name, name.asModuleName()) dependency.configure() addToPods(dependency) }