use scrooge 3.0.0, and update paths to make scrooge 3.0.0 work

twitter-archive · May 30, 2012 · 9888a03 · 9888a03
1 parent 50315f1
commit 9888a03
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -11,7 +11,7 @@ object SbtScroogePlugin extends Build {
   ).settings(
     name := "sbt11-scrooge",
     organization := "com.twitter",
-    version := "1.0.1-SNAPSHOT",
+    version := "3.0.0-SNAPSHOT",
     sbtPlugin := true,
 
     SubversionPublisher.subversionRepository := Some("https://svn.twitter.biz/maven-public")

diff --git a/src/main/scala/com/twitter/sbt/CompileScrooge.scala b/src/main/scala/com/twitter/sbt/CompileScrooge.scala
@@ -148,14 +148,14 @@ object CompileThriftScrooge extends Plugin {
   )
 
   val newSettings = Seq(
-    scroogeVersion := "2.4.0",
+    scroogeVersion := "3.0.0",
     scroogeBuildOptions := Seq("--finagle", "--ostrich", "--verbose"),
     scroogeName <<= (scroogeVersion) { ver => "scrooge-%s".format(ver) },
-    scroogeCacheFolder <<= (baseDirectory, scroogeName) { (base, scrooge) =>
-      base / "project" / "target" / scrooge
+    scroogeCacheFolder <<= (baseDirectory) { (base) =>
+      base / "project" / "target"
     },
     scroogeJar <<= (scroogeCacheFolder, scroogeName) { (folder, name) =>
-      folder / (name + ".jar")
+      folder / name / (name + ".jar")
     },
 
     scroogeFetch <<= (