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

[Gradle, MPP] address KT-42755 Cocoapods plugin using backslashes on Windows

Browse Source 
Co-authored-by: Andreas Mattsson <andreas@andreasmattsson.com>

Merge-request: KT-MR-4719
This commit is contained in:
Viacheslav Kormushkin
2021-10-11 13:04:05 +00:00
committed by Space
parent 5e874bc3c5
commit b00a43802a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt
+3 -3
View File
@@ -128,8 +128,8 @@ open class PodspecTask : DefaultTask() {
"| spec.dependency '${pod.name}'$versionSuffix" "| spec.dependency '${pod.name}'$versionSuffix"
}.joinToString(separator = "\n") }.joinToString(separator = "\n")
val frameworkDir = project.cocoapodsBuildDirs.framework.relativeTo(outputFile.parentFile).path val frameworkDir = project.cocoapodsBuildDirs.framework.relativeTo(outputFile.parentFile)
val vendoredFramework = if (publishing.get()) "${frameworkName.get()}.xcframework" else "$frameworkDir/${frameworkName.get()}.framework" 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 vendoredFrameworks = if (extraSpecAttributes.get().containsKey("vendored_frameworks")) "" else "| spec.vendored_frameworks = '$vendoredFramework'"
val libraries = if (extraSpecAttributes.get().containsKey("libraries")) "" else "| spec.libraries = 'c++'" val libraries = if (extraSpecAttributes.get().containsKey("libraries")) "" else "| spec.libraries = 'c++'"
@@ -142,7 +142,7 @@ open class PodspecTask : DefaultTask() {
| } | }
""".trimMargin() """.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 val scriptPhase = if (publishing.get() || extraSpecAttributes.get().containsKey("script_phases")) "" else
""" | """ |
| spec.script_phases = [ | spec.script_phases = [