diff --git a/src/main/kotlin/com/beust/kobalt/app/remote/GetDependenciesCommand.kt b/src/main/kotlin/com/beust/kobalt/app/remote/GetDependenciesCommand.kt index 295f1525..a7c31b66 100644 --- a/src/main/kotlin/com/beust/kobalt/app/remote/GetDependenciesCommand.kt +++ b/src/main/kotlin/com/beust/kobalt/app/remote/GetDependenciesCommand.kt @@ -51,15 +51,11 @@ class GetDependenciesCommand @Inject constructor(val executors: KobaltExecutors, val pluginDependencies = pluginUrls.map { File(it.toURI()) }.map { FileDependency(it.absolutePath) } projects.forEach { project -> - val allDependencies = - pluginDependencies.map { toDependencyData(it, "compile")} + - allDeps(project.compileDependencies).map { toDependencyData(it, "compile") } + - allDeps(project.compileProvidedDependencies).map { toDependencyData(it, "provided") } + - allDeps(project.compileRuntimeDependencies).map { toDependencyData(it, "runtime") } + - allDeps(project.testDependencies).map { toDependencyData(it, "testCompile") } + - allDeps(project.testProvidedDependencies).map { toDependencyData(it, "testProvided") } + val compileDependencies = pluginDependencies.map { toDependencyData(it, "compile")} + + allDeps(project.compileDependencies).map { toDependencyData(it, "compile") } + val testDependencies = allDeps(project.testDependencies).map { toDependencyData(it, "testCompile") } - projectDatas.add(ProjectData(project.name, project.directory, allDependencies, + projectDatas.add(ProjectData(project.name, project.directory, compileDependencies, testDependencies, project.sourceDirectories, project.sourceDirectoriesTest)) } log(1, "Returning BuildScriptInfo") @@ -74,8 +70,8 @@ class GetDependenciesCommand @Inject constructor(val executors: KobaltExecutors, class DependencyData(val id: String, val scope: String, val path: String) - class ProjectData(val name: String, val directory: String, val dependencies: List, - val sourceDirs: Set, val testDirs: Set) + class ProjectData(val name: String, val directory: String, val compileDependencies: List, + val testDependencies: List, val sourceDirs: Set, val testDirs: Set) class GetDependenciesData(val projects: List) } \ No newline at end of file