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

Fix adding non-directory to resources for Android source set

Browse Source 
#KTIJ-17113 Fixed
This commit is contained in:
Yaroslav Chernyshev
2021-06-09 15:11:48 +03:00
parent e12f3ff88a
commit 6f8b3f22ca
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt
-2
View File
@@ -639,8 +639,6 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
checkProjectStructure(exhaustiveModuleList = false, exhaustiveDependencyList = false, exhaustiveSourceSourceRootList = false) { checkProjectStructure(exhaustiveModuleList = false, exhaustiveDependencyList = false, exhaustiveSourceSourceRootList = false) {
module("multiplatformb") { module("multiplatformb") {
sourceFolder("multiplatformb/src/androidMain/kotlin", JavaSourceRootType.SOURCE) sourceFolder("multiplatformb/src/androidMain/kotlin", JavaSourceRootType.SOURCE)
} }
} }
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/syncKotlinAndAndroidSourceSets.kt
+1 -1
View File
@@ -105,7 +105,7 @@ private fun syncKotlinAndAndroidResources(
val project = target.project val project = target.project
androidSourceSet.resources.srcDirs(*kotlinSourceSet.resources.toList().toTypedArray()) androidSourceSet.resources.srcDirs(*kotlinSourceSet.resources.srcDirs.toList().toTypedArray())
if (androidSourceSet.resources.srcDirs.isNotEmpty()) { if (androidSourceSet.resources.srcDirs.isNotEmpty()) {
androidSourceSet.resources.srcDir(defaultSourceFolder(project, kotlinSourceSet.name, "resources")) androidSourceSet.resources.srcDir(defaultSourceFolder(project, kotlinSourceSet.name, "resources"))
kotlinSourceSet.resources.srcDirs(androidSourceSet.resources.srcDirs) kotlinSourceSet.resources.srcDirs(androidSourceSet.resources.srcDirs)