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

[Gradle, Cocoapods] Complete logging for corner-case pod configurations

Browse Source
This commit is contained in:
Yaroslav Chernyshev
2020-09-28 13:35:22 +03:00
parent 5f4aa4db27
commit 819e83b68b
1 changed files with 11 additions and 5 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
+11 -5
View File
@@ -116,17 +116,23 @@ open class CocoapodsExtension(private val project: Project) {
val buildScript = project.buildFile val buildScript = project.buildFile
val lines = buildScript.readLines() val lines = buildScript.readLines()
val lineNumber = lines.indexOfFirst { pattern.matches(it) } val lineNumber = lines.indexOfFirst { pattern.matches(it) }
val lineContent = lines[lineNumber].trimIndent() val warnMessage = if (lineNumber != -1) run {
val newContent = lineContent.replace(path.name, "") val lineContent = lines[lineNumber].trimIndent()
project.logger.warn( val newContent = lineContent.replace(path.name, "")
""" """
|Deprecated DSL used on ${buildScript.absolutePath}${File.pathSeparator}${lineNumber + 1}: |Deprecated DSL found on ${buildScript.absolutePath}${File.pathSeparator}${lineNumber + 1}:
|Found: "${lineContent}" |Found: "${lineContent}"
|Expected: "${newContent}" |Expected: "${newContent}"
|Please, change the path to avoid this warning. |Please, change the path to avoid this warning.
| |
""".trimMargin() """.trimMargin()
) } else
"""
|Deprecated DSL is used for pod "$name".
|Please, change its path from ${path.path} to ${path.parentFile.path}
|
""".trimMargin()
project.logger.warn(warnMessage)
podSource = path.parentFile podSource = path.parentFile
} }
addToPods(CocoapodsDependency(name, moduleName, version, podSource?.let { Path(it) })) addToPods(CocoapodsDependency(name, moduleName, version, podSource?.let { Path(it) }))