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

Gradle, CocoaPods: Support pods with dashes in names

Browse Source 
See https://github.com/JetBrains/kotlin-native/issues/2884
This commit is contained in:
Ilya Matveev
2020-07-15 16:38:49 +07:00
committed by Ilya Matveev
parent 635869f15a
commit 85908713b1
1 changed files with 7 additions and 1 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/cocoapods/CocoapodsExtension.kt
+7 -1
View File
@@ -99,7 +99,7 @@ open class CocoapodsExtension(private val project: Project) {
* Add a CocoaPods dependency to the pod built from this project. * Add a CocoaPods dependency to the pod built from this project.
*/ */
@JvmOverloads @JvmOverloads
fun pod(name: String, version: String? = null, podspec: File? = null, moduleName: String = name.split("/")[0]) { fun pod(name: String, version: String? = null, podspec: File? = null, moduleName: String = name.asModuleName()) {
check(_pods.findByName(name) == null) { "Project already has a CocoaPods dependency with name $name" } check(_pods.findByName(name) == null) { "Project already has a CocoaPods dependency with name $name" }
_pods.add(CocoapodsDependency(name, version, podspec, moduleName)) _pods.add(CocoapodsDependency(name, version, podspec, moduleName))
} }
@@ -122,4 +122,10 @@ open class CocoapodsExtension(private val project: Project) {
@Input @Input
override fun getName(): String = name override fun getName(): String = name
} }
companion object {
private fun String.asModuleName() = this
.split("/")[0] // Pick the module name from a subspec name.
.replace('-', '_') // Support pods with dashes in names (see https://github.com/JetBrains/kotlin-native/issues/2884).
}
} }