Merge pull request #196 from colinmarc/bijectionscrooge-scala211

Build bijection-scrooge for scala 2.11
twitter · Feb 21, 2015 · f6c8894 · f6c8894
2 parents 76f6377 + e97acbe
commit f6c8894
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -209,22 +209,13 @@ object BijectionBuild extends Build {
     )
   ).dependsOn(bijectionCore % "test->test;compile->compile")
 
-  def scroogeBuildDeps(scalaVersion: String): Seq[sbt.ModuleID] = isScala210x(scalaVersion) match {
-      case false => Seq()
-      case true => Seq(
-        "com.twitter" %% "scrooge-serializer" % "3.6.0"
-     )
-  }
-
   lazy val bijectionScrooge = module("scrooge").settings(
-    skip in compile := !isScala210x(scalaVersion.value),
-    skip in test := !isScala210x(scalaVersion.value),
-    publishArtifact := isScala210x(scalaVersion.value),
-
     osgiExportAll("com.twitter.bijection.scrooge"),
     libraryDependencies ++= Seq(
-      "org.apache.thrift" % "libthrift" % "0.6.1" exclude("junit", "junit")
-    ) ++ scroogeBuildDeps(scalaVersion.value)
+      "org.apache.thrift" % "libthrift" % "0.6.1" exclude("junit", "junit"),
+      "com.twitter" %% "scrooge-serializer" % "3.17.0",
+      "com.twitter" %% "finagle-core" % "6.24.0" % "test"
+    )
   ).dependsOn(bijectionCore % "test->test;compile->compile")
 
   lazy val bijectionJson = module("json").settings(