From 136fcab0a4071fc0266a585aff96aaeb607bf4e2 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Mon, 14 Mar 2016 23:54:17 +0400 Subject: [PATCH] Pass resources to the IDEA plug-in. --- .../com/beust/kobalt/app/remote/DependencyData.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/app/remote/DependencyData.kt b/src/main/kotlin/com/beust/kobalt/app/remote/DependencyData.kt index a2c06fa8..1cd7d95e 100644 --- a/src/main/kotlin/com/beust/kobalt/app/remote/DependencyData.kt +++ b/src/main/kotlin/com/beust/kobalt/app/remote/DependencyData.kt @@ -10,6 +10,7 @@ import com.beust.kobalt.internal.build.BuildFile import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.dependency.FileDependency import com.beust.kobalt.maven.dependency.MavenDependency +import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KobaltExecutors import com.google.inject.Inject import java.io.File @@ -48,9 +49,13 @@ class DependencyData @Inject constructor(val executors: KobaltExecutors, val dep it.name } } + + // Separate resource from source directories + val sources = project.sourceDirectories.partition { KFiles.isResource(it) } + val tests = project.sourceDirectoriesTest.partition { KFiles.isResource(it) } projectDatas.add(ProjectData(project.name, project.directory, dependentProjects, compileDependencies, testDependencies, - project.sourceDirectories, project.sourceDirectoriesTest)) + sources.second.toSet(), tests.second.toSet(), sources.first.toSet(), tests.first.toSet())) } return GetDependenciesData(projectDatas) } @@ -64,7 +69,8 @@ class DependencyData @Inject constructor(val executors: KobaltExecutors, val dep class ProjectData(val name: String, val directory: String, val dependentProjects: List, val compileDependencies: List, - val testDependencies: List, val sourceDirs: Set, val testDirs: Set) + val testDependencies: List, val sourceDirs: Set, val testDirs: Set, + val sourceResourceDirs: Set, val testResourceDirs: Set) class GetDependenciesData(val projects: List) -} \ No newline at end of file +}