erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Plug-in dependencies should be returned as DependencyData.

Browse source
This commit is contained in:
Cedric Beust 2017-02-20 06:54:00 -08:00
parent 1baca0cd35
commit 3215280d92
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/kotlin/com/beust/kobalt/app/remote/RemoteDependencyData.kt
View file

@ -10,7 +10,6 @@ import com.beust.kobalt.internal.PluginInfo
import com.beust.kobalt.internal.TaskManager import com.beust.kobalt.internal.TaskManager
import com.beust.kobalt.internal.build.BuildFile import com.beust.kobalt.internal.build.BuildFile
import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.dependency.FileDependency
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.Versions import com.beust.kobalt.misc.Versions
@ -47,13 +46,12 @@ class RemoteDependencyData @Inject constructor(val executors: KobaltExecutors, v
val projectResult = buildFileCompiler.compileBuildFiles(args) val projectResult = buildFileCompiler.compileBuildFiles(args)
val pluginDependencies = projectResult.pluginUrls.map { File(it.toURI()) }.map { val pluginDependencies = projectResult.pluginUrls.map { File(it.toURI()) }.map {
FileDependency(it.absolutePath) DependencyData(it.name, "compile", it.absolutePath)
} }
fun compileDependencies(project: Project, name: String): List<DependencyData> { fun compileDependencies(project: Project, name: String): List<DependencyData> {
val result = val result =
(pluginDependencies + (allDeps(project.compileDependencies, name) +
allDeps(project.compileDependencies, name) +
allDeps(project.compileProvidedDependencies, name)) allDeps(project.compileProvidedDependencies, name))
.map { toDependencyData(it, "compile") } .map { toDependencyData(it, "compile") }
return result return result
@ -175,8 +173,7 @@ class RemoteDependencyData @Inject constructor(val executors: KobaltExecutors, v
}) })
} }
val pluginFileDependencies = pluginDependencies.map { it.jarFile.get() } return GetDependenciesData(projectDatas, allTasks, pluginDependencies,
return GetDependenciesData(projectDatas, allTasks, pluginFileDependencies,
projectResult.taskResult.errorMessage) projectResult.taskResult.errorMessage)
} }
@ -201,7 +198,7 @@ class RemoteDependencyData @Inject constructor(val executors: KobaltExecutors, v
class GetDependenciesData(val projects: List<ProjectData> = emptyList(), class GetDependenciesData(val projects: List<ProjectData> = emptyList(),
val allTasks: Collection<TaskData> = emptySet(), val allTasks: Collection<TaskData> = emptySet(),
val pluginDependencies: List<File> = emptyList(), val pluginDependencies: List<DependencyData> = emptyList(),
val errorMessage: String?) { val errorMessage: String?) {
companion object { companion object {
val NAME = "GetDependencies" val NAME = "GetDependencies"