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

[Gradle, Cocoapods] Improve logging when deprecated podspec path is used

Browse Source 
#KT-41948 Fixed
This commit is contained in:
Yaroslav Chernyshev
2020-09-27 21:34:53 +03:00
parent 330502a0a6
commit 5f4aa4db27
1 changed files with 16 additions and 2 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
+16 -2
View File
@@ -109,12 +109,26 @@ open class CocoapodsExtension(private val project: Project) {
fun pod(name: String, version: String? = null, path: File? = null, moduleName: String = name.asModuleName()) { fun pod(name: String, version: String? = null, path: File? = null, moduleName: String = name.asModuleName()) {
// Empty string will lead to an attempt to create two podDownload tasks. // Empty string will lead to an attempt to create two podDownload tasks.
// One is original podDownload and second is podDownload + pod.name // One is original podDownload and second is podDownload + pod.name
require(name.isNotEmpty()) { "Please provide not empty pod name to avoid ambiguity" }
var podSource = path var podSource = path
if (path != null && !path.isDirectory) { if (path != null && !path.isDirectory) {
project.logger.warn("Please use directory with podspec file, not podspec file itself") val pattern = "\\W*pod(.*\"${name}\".*)".toRegex()
val buildScript = project.buildFile
val lines = buildScript.readLines()
val lineNumber = lines.indexOfFirst { pattern.matches(it) }
val lineContent = lines[lineNumber].trimIndent()
val newContent = lineContent.replace(path.name, "")
project.logger.warn(
"""
|Deprecated DSL used on ${buildScript.absolutePath}${File.pathSeparator}${lineNumber + 1}:
|Found: "${lineContent}"
|Expected: "${newContent}"
|Please, change the path to avoid this warning.
|
""".trimMargin()
)
podSource = path.parentFile podSource = path.parentFile
} }
require(name.isNotEmpty()) { "Please provide not empty pod name to avoid ambiguity" }
addToPods(CocoapodsDependency(name, moduleName, version, podSource?.let { Path(it) })) addToPods(CocoapodsDependency(name, moduleName, version, podSource?.let { Path(it) }))
} }