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

Fix getOutputForTask for newer Gradle versions

Browse Source
This commit is contained in:
Sergey Igushkin
2017-11-03 18:20:20 +03:00
parent c394b50cb8
commit ced5bf6e2c
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+4 -11
View File
@@ -386,18 +386,11 @@ abstract class BaseGradleIT {
} }
fun CompiledProject.getOutputForTask(taskName: String): String { fun CompiledProject.getOutputForTask(taskName: String): String {
fun String.substringAfter(delimiter: String, missingDelimiterValue: () -> String): String { val taskOutputRegex = ("\\[LIFECYCLE] \\[class org\\.gradle(?:\\.internal\\.buildevents)?\\.TaskExecutionLogger] :$taskName" +
val index = indexOf(delimiter) "([\\s\\S]+?)" +
return if (index == -1) missingDelimiterValue() else substring(index + delimiter.length, length) "Finished executing task ':$taskName'").toRegex()
}
fun String.substringBefore(delimiter: String, missingDelimiterValue: () -> String): String { return taskOutputRegex.find(output)?.run { groupValues[1] } ?: error("Cannot find output for task $taskName")
val index = indexOf(delimiter)
return if (index == -1) missingDelimiterValue() else substring(0, index)
}
return output.substringAfter("[LIFECYCLE] [class org.gradle.TaskExecutionLogger] :$taskName") { error("Can't find start for task $taskName") }
.substringBefore("Finished executing task ':$taskName'") { error("Can't find completion for task $taskName") }
} }
fun CompiledProject.assertCompiledKotlinSources( fun CompiledProject.assertCompiledKotlinSources(