luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-08-22 06:07:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Combine ConfigurationReport's conf with ModuleReport's confs

Browse Source
This commit is contained in:
Martin Duhem
2015-11-30 10:03:40 +01:00
parent 222623071a
commit f49fb33e6d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ivy/src/main/scala/sbt/UpdateReport.scala
+8 -2
View File
@@ -31,8 +31,14 @@ final class ConfigurationReport(
* All resolved modules for this configuration. * All resolved modules for this configuration.
* For a given organization and module name, there is only one revision/`ModuleID` in this sequence. * For a given organization and module name, there is only one revision/`ModuleID` in this sequence.
*/ */
def allModules: Seq[ModuleID] = modules.map(mr => addConfiguration(mr.module)) def allModules: Seq[ModuleID] = modules map addConfiguration
private[this] def addConfiguration(mod: ModuleID): ModuleID = if (mod.configurations.isEmpty) mod.copy(configurations = Some(configuration)) else mod private[this] def addConfiguration(mr: ModuleReport): ModuleID = {
val module = mr.module
if (module.configurations.isEmpty) {
val conf = mr.configurations map (c => s"$configuration->$c") mkString ","
module.copy(configurations = Some(conf))
} else module
}
def retrieve(f: (String, ModuleID, Artifact, File) => File): ConfigurationReport = def retrieve(f: (String, ModuleID, Artifact, File) => File): ConfigurationReport =
new ConfigurationReport(configuration, modules map { _.retrieve((mid, art, file) => f(configuration, mid, art, file)) }, details, evicted) new ConfigurationReport(configuration, modules map { _.retrieve((mid, art, file) => f(configuration, mid, art, file)) }, details, evicted)