luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44 from 2beaucoup/master 

match scala-library just by org/name
This commit is contained in:
Johannes Rudolph 2014-01-16 01:35:21 -08:00
parent 9988c8fbe2 1f65c0c86b
commit b4667b7564
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/net/virtualvoid/sbt/graph/IvyGraphMLDependencies.scala
View File

@ -118,10 +118,11 @@ object IvyGraphMLDependencies extends App {
} }
def ignoreScalaLibrary(scalaVersion: String, graph: ModuleGraph): ModuleGraph = { def ignoreScalaLibrary(scalaVersion: String, graph: ModuleGraph): ModuleGraph = {
val scalaLibraryId = ModuleId("org.scala-lang", "scala-library", scalaVersion) def isScalaLibrary(m: Module) = isScalaLibraryId(m.id)
def isScalaLibraryId(id: ModuleId) = id.organisation == "org.scala-lang" && id.name == "scala-library"
def dependsOnScalaLibrary(m: Module): Boolean = def dependsOnScalaLibrary(m: Module): Boolean =
graph.dependencyMap(m.id).map(_.id).contains(scalaLibraryId) graph.dependencyMap(m.id).exists(isScalaLibrary)
def addScalaLibraryAnnotation(m: Module): Module = { def addScalaLibraryAnnotation(m: Module): Module = {
if (dependsOnScalaLibrary(m)) if (dependsOnScalaLibrary(m))
@ -130,8 +131,8 @@ object IvyGraphMLDependencies extends App {
m m
} }
val newNodes = graph.nodes.map(addScalaLibraryAnnotation).filterNot(_.id == scalaLibraryId) val newNodes = graph.nodes.map(addScalaLibraryAnnotation).filterNot(isScalaLibrary)
val newEdges = graph.edges.filterNot(_._2 == scalaLibraryId) val newEdges = graph.edges.filterNot(e => isScalaLibraryId(e._2))
ModuleGraph(newNodes, newEdges) ModuleGraph(newNodes, newEdges)
} }