From dfe76a2aeae9c23aec1cda6b355a83a08d088ca5 Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Sun, 28 Apr 2013 10:49:47 +0200 Subject: [PATCH] fixes #30, #31: resolution report path changed in sbt 0.12.3 --- notes/0.7.3.markdown | 1 + src/main/scala/net/virtualvoid/sbt/graph/Plugin.scala | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 notes/0.7.3.markdown diff --git a/notes/0.7.3.markdown b/notes/0.7.3.markdown new file mode 100644 index 000000000..ac3efb880 --- /dev/null +++ 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 index 7b3b0b912..a54005acf 100755 --- 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))