From b00a43802a9b054db99519d0a1671e466540fe0f Mon Sep 17 00:00:00 2001 From: Viacheslav Kormushkin Date: Mon, 11 Oct 2021 13:04:05 +0000 Subject: [PATCH] [Gradle, MPP] address KT-42755 Cocoapods plugin using backslashes on Windows Co-authored-by: Andreas Mattsson Merge-request: KT-MR-4719 --- .../kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 f1048213863..e7e26d48944 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 @@ -128,8 +128,8 @@ open class PodspecTask : DefaultTask() { "| spec.dependency '${pod.name}'$versionSuffix" }.joinToString(separator = "\n") - val frameworkDir = project.cocoapodsBuildDirs.framework.relativeTo(outputFile.parentFile).path - val vendoredFramework = if (publishing.get()) "${frameworkName.get()}.xcframework" else "$frameworkDir/${frameworkName.get()}.framework" + val frameworkDir = project.cocoapodsBuildDirs.framework.relativeTo(outputFile.parentFile) + val vendoredFramework = if (publishing.get()) "${frameworkName.get()}.xcframework" else frameworkDir.resolve("${frameworkName.get()}.framework").invariantSeparatorsPath val vendoredFrameworks = if (extraSpecAttributes.get().containsKey("vendored_frameworks")) "" else "| spec.vendored_frameworks = '$vendoredFramework'" val libraries = if (extraSpecAttributes.get().containsKey("libraries")) "" else "| spec.libraries = 'c++'" @@ -142,7 +142,7 @@ open class PodspecTask : DefaultTask() { | } """.trimMargin() - val gradleCommand = "\$REPO_ROOT/${gradleWrapper.toRelativeString(project.projectDir)}" + val gradleCommand = "\$REPO_ROOT/${gradleWrapper.relativeTo(project.projectDir).invariantSeparatorsPath}" val scriptPhase = if (publishing.get() || extraSpecAttributes.get().containsKey("script_phases")) "" else """ | | spec.script_phases = [