Adds Scrooge 2.11 support now that the artifact is out, sets up for c…

.travis.yml

@@ -1,5 +1,5 @@
 language: scala
 sudo: false
 scala:
-  - 2.10.4
-  - 2.11.2
+  - 2.10.5
+  - 2.11.7

project/Build.scala

@@ -23,7 +23,7 @@ object ChillBuild extends Build {
     version := "0.6.0",
     organization := "com.twitter",
     scalaVersion := "2.10.5",
-    crossScalaVersions := Seq("2.10.5", "2.11.5"),
+    crossScalaVersions := Seq("2.10.5", "2.11.7"),
     scalacOptions ++= Seq("-unchecked", "-deprecation"),
     ScalariformKeys.preferences := formattingPreferences,
 
@@ -133,7 +133,12 @@ object ChillBuild extends Build {
     val id = "chill-%s".format(name)
     Project(id = id, base = file(id), settings = sharedSettings ++ Seq(
       Keys.name := id,
-      previousArtifact := youngestForwardCompatible(name))
+      previousArtifact := youngestForwardCompatible(name),
+      // Disable cross publishing for java artifacts
+      publishArtifact <<= (scalaVersion) { scalaVersion =>
+        if(javaOnly.contains(name) && scalaVersion.startsWith("2.10")) false else true
+      }
+      )
     )
   }
 
@@ -199,20 +204,11 @@ object ChillBuild extends Build {
     )
   )
 
-   def scroogeBuildDeps(scalaVersion: String): Seq[sbt.ModuleID] = isScala210x(scalaVersion) match {
-      case false => Seq()
-      case true => Seq(
-        "com.twitter" %% "scrooge-serializer" % "3.13.0"
-     )
-  }
-
   lazy val chillScrooge = module("scrooge").settings(
-    skip in compile := !isScala210x(scalaVersion.value),
-    skip in test := !isScala210x(scalaVersion.value),
-    publishArtifact := isScala210x(scalaVersion.value),
     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.20.0"
+    )
   ).dependsOn(chill % "test->test;compile->compile")
 
   // This can only have java deps!