From b921eb5cc9dbbb099beb3c20d4f13a942289c5d1 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Thu, 19 Oct 2017 14:29:58 +0300 Subject: [PATCH] Fix null returned from `listFiles` and not handled correctly. (cherry picked from commit 8147ae8) --- .../org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt index 91afba707f1..614f70125fe 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt @@ -136,7 +136,7 @@ class AndroidSubplugin : KotlinGradleSubplugin { fun isLayoutDirectory(file: File) = file.name == "layout" || file.name.startsWith("layout-") return resDirectories.flatMap { resDir -> - (resDir.listFiles(::isLayoutDirectory)).asList() + (resDir.listFiles(::isLayoutDirectory)).orEmpty().asList() } }