Fix adding non-directory to resources for Android source set
#KTIJ-17113 Fixed
This commit is contained in:
-2
@@ -639,8 +639,6 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
|
||||
checkProjectStructure(exhaustiveModuleList = false, exhaustiveDependencyList = false, exhaustiveSourceSourceRootList = false) {
|
||||
module("multiplatformb") {
|
||||
sourceFolder("multiplatformb/src/androidMain/kotlin", JavaSourceRootType.SOURCE)
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user