Fix compilation.

- rename isFinal extension property to avoid ambiguity with synthetic property in DeserializedClassTypeConstructor
- add explicit parameter to lambda File.listFiles
- return true from lambda Query.forEach
This commit is contained in:
Stanislav Erokhin
2015-12-18 18:54:37 +03:00
parent 1574dc78df
commit bcaa755c4e
16 changed files with 21 additions and 19 deletions
@@ -41,7 +41,7 @@ public abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() {
}
private fun createEnvironmentForConfiguration(configuration: CompilerConfiguration, path: String) {
val layoutPaths = File(path).listFiles { it.name.startsWith("layout") && it.isDirectory }!!.map { "$path${it.name}/" }
val layoutPaths = File(path).listFiles { it -> it.name.startsWith("layout") && it.isDirectory }!!.map { "$path${it.name}/" }
myEnvironment = createAndroidTestEnvironment(configuration, layoutPaths)
}
@@ -54,5 +54,5 @@ fun UsefulTestCase.createAndroidTestEnvironment(configuration: CompilerConfigura
}
fun getResPaths(path: String): List<String> {
return File(path).listFiles { it.name.startsWith("res") && it.isDirectory }!!.map { "$path${it.name}/" }
return File(path).listFiles { it -> it.name.startsWith("res") && it.isDirectory }!!.map { "$path${it.name}/" }
}