fixes #30, #31: resolution report path changed in sbt 0.12.3

sbt · Apr 28, 2013 · dfe76a2 · dfe76a2 · ebowman · Apr 28, 2013
1 parent bfbaed2
commit dfe76a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/notes/0.7.3.markdown b/notes/0.7.3.markdown
@@ -0,0 +1 @@
+This is a maintenance release which fixes issues with sbt 0.12.3. Thanks [ebowman](https://github.com/ebowman) for the fix.
diff --git a/src/main/scala/net/virtualvoid/sbt/graph/Plugin.scala b/src/main/scala/net/virtualvoid/sbt/graph/Plugin.scala
@@ -67,7 +67,9 @@ object Plugin extends sbt.Plugin {
   def graphSettings = seq(
     ivyReportFunction <<= (sbtVersion, target, projectID, ivyModule, appConfiguration, streams) map { (sbtV, target, projectID, ivyModule, config, streams) =>
       sbtV match {
-        case Version(0, min, fix, _) if min > 12 || (min == 12 && fix >= 1) =>
+        case Version(0, min, fix, _) if min > 12 || (min == 12 && fix >= 3) =>
+          (c: String) => file("%s/resolution-cache/reports/%s-%s-%s.xml".format(target, projectID.organization, crossName(ivyModule), c))
+        case Version(0, min, fix, _) if min == 12 && fix >= 1 && fix < 3 =>
           ivyModule.withModule(streams.log) { (i, moduleDesc, _) =>
             val id = ResolveOptions.getDefaultResolveId(moduleDesc)
             (c: String) => file("%s/resolution-cache/reports/%s/%s-resolved.xml" format (target, id,c))