Fix adding non-directory to resources for Android source set

#KTIJ-17113 Fixed
JetBrains · Jun 18, 2021 · 679e768 · 679e768
1 parent 6b8cae2
commit 679e768
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt
@@ -639,8 +639,6 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
         checkProjectStructure(exhaustiveModuleList = false, exhaustiveDependencyList = false, exhaustiveSourceSourceRootList = false) {
             module("multiplatformb") {
                 sourceFolder("multiplatformb/src/androidMain/kotlin", JavaSourceRootType.SOURCE)
-
-
             }
         }
     }

diff --git a/.../src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/syncKotlinAndAndroidSourceSets.kt b/.../src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/syncKotlinAndAndroidSourceSets.kt
@@ -105,7 +105,7 @@ private fun syncKotlinAndAndroidResources(
 
     val project = target.project
 
-    androidSourceSet.resources.srcDirs(*kotlinSourceSet.resources.toList().toTypedArray())
+    androidSourceSet.resources.srcDirs(*kotlinSourceSet.resources.srcDirs.toList().toTypedArray())
     if (androidSourceSet.resources.srcDirs.isNotEmpty()) {
         androidSourceSet.resources.srcDir(defaultSourceFolder(project, kotlinSourceSet.name, "resources"))
         kotlinSourceSet.resources.srcDirs(androidSourceSet.resources.srcDirs)