1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 00:17:11 -07:00

Return plug-in dependencies in their own JSON section.

This commit is contained in:
Cedric Beust 2017-02-17 13:44:13 -08:00
parent 4f78e911e3
commit a9902f136b

View file

@ -71,8 +71,7 @@ class RemoteDependencyData @Inject constructor(val executors: KobaltExecutors, v
fun compileDependenciesGraph(project: Project, name: String): List<DependencyData> {
val depLambda = IClasspathDependency::directDependencies
val result =
(DynamicGraph.Companion.transitiveClosureGraph(pluginDependencies, depLambda, OPTIONAL_FILTER) +
DynamicGraph.Companion.transitiveClosureGraph(project.compileDependencies, depLambda,
(DynamicGraph.Companion.transitiveClosureGraph(project.compileDependencies, depLambda,
OPTIONAL_FILTER) +
DynamicGraph.Companion.transitiveClosureGraph(project.compileProvidedDependencies, depLambda,
OPTIONAL_FILTER))
@ -169,7 +168,9 @@ class RemoteDependencyData @Inject constructor(val executors: KobaltExecutors, v
})
}
return GetDependenciesData(projectDatas, allTasks, projectResult.taskResult.errorMessage)
val pluginFileDependencies = pluginDependencies.map { it.jarFile.get() }
return GetDependenciesData(projectDatas, allTasks, pluginFileDependencies,
projectResult.taskResult.errorMessage)
}
/////
@ -193,6 +194,7 @@ class RemoteDependencyData @Inject constructor(val executors: KobaltExecutors, v
class GetDependenciesData(val projects: List<ProjectData> = emptyList(),
val allTasks: Collection<TaskData> = emptySet(),
val pluginDependencies: List<File> = emptyList(),
val errorMessage: String?) {
companion object {
val NAME = "GetDependencies"