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

Fix null returned from listFiles and not handled correctly.

Browse Source 
(cherry picked from commit 8147ae8)
This commit is contained in:
Sergey Igushkin
2017-10-19 14:29:58 +03:00
parent e90c914802
commit b921eb5cc9
1 changed files with 1 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/internal/AndroidSubplugin.kt
+1 -1
View File
@@ -136,7 +136,7 @@ class AndroidSubplugin : KotlinGradleSubplugin<KotlinCompile> {
fun isLayoutDirectory(file: File) = file.name == "layout" || file.name.startsWith("layout-") fun isLayoutDirectory(file: File) = file.name == "layout" || file.name.startsWith("layout-")
return resDirectories.flatMap { resDir -> return resDirectories.flatMap { resDir ->
(resDir.listFiles(::isLayoutDirectory)).asList() (resDir.listFiles(::isLayoutDirectory)).orEmpty().asList()
} }
} }