From eebed9a8b178ea8212b820519eaad6135be864e8 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 26 Feb 2015 21:26:24 +0300 Subject: [PATCH] Add all layout directories to sources in Android Gradle subplugin --- .../kotlin/org/jetbrains/kotlin/android/AndroidSubplugin.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-android-compiler-plugin/src/main/kotlin/org/jetbrains/kotlin/android/AndroidSubplugin.kt b/libraries/tools/kotlin-android-compiler-plugin/src/main/kotlin/org/jetbrains/kotlin/android/AndroidSubplugin.kt index eebf2988df8..543aec2e29f 100644 --- a/libraries/tools/kotlin-android-compiler-plugin/src/main/kotlin/org/jetbrains/kotlin/android/AndroidSubplugin.kt +++ b/libraries/tools/kotlin-android-compiler-plugin/src/main/kotlin/org/jetbrains/kotlin/android/AndroidSubplugin.kt @@ -37,10 +37,9 @@ public class AndroidSubplugin : KotlinGradleSubplugin { val manifestFile = mainSourceSet.getManifest().getSrcFile() if (resourceDir != null) { - val layoutDir = File(resourceDir, "layout") - task.source(layoutDir) + resourceDir.listFiles { it.isDirectory() && it.name.startsWith("layout") }?.forEach { task.source(it) } return listOf( - SubpluginOption("androidRes", layoutDir.getAbsolutePath()), + SubpluginOption("androidRes", resourceDir.getAbsolutePath()), SubpluginOption("androidManifest", manifestFile.getAbsolutePath()) ) }