Merge branch 'release/0.7.0'

Conflicts:
	project/Build.scala

Author: ianoc

.travis.yml

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

CHANGES.md

@@ -1,5 +1,12 @@
 # chill #
 
+### 0.7.0 ###
+* Adds Scrooge 2.11 support now that the artifact is out, sets up for c…: https://github.com/twitter/chill/pull/236
+* make chill 1.6 compatible: https://github.com/twitter/chill/pull/231
+* Update README.md: https://github.com/twitter/chill/pull/232
+* Alter scala collection default serializer registration order: https://github.com/twitter/chill/pull/229
+* Build chill-scrooge for scala 2.11, too: https://github.com/twitter/chill/pull/219
+
 ### 0.6.0 ###
 * Add build instructions to readme and make InjectiveSerializer serializable #216
 * Build chill-scrooge for scala 2.11, too #219

README.md

@@ -5,7 +5,7 @@ serializers and a set of classes to ease configuration of Kryo in systems like H
 Akka, etc.
 
 
-### Buidling Chill
+### Building Chill
 
 ```bash
 ./sbt

chill-java/src/main/java/com/twitter/chill/java/BitSetSerializer.java

@@ -28,6 +28,7 @@
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.BitSet;
 
@@ -89,18 +90,27 @@ public BitSet read(Kryo kryo, Input input, Class<BitSet> bitSetClass) {
         }
 
         BitSet ret = null;
-        // call a private constructor: (the BitSet.valueOf() cTor is only available from Java 1.7)
+
         try {
             ret = bitSetConstructor.newInstance(target);
-        } catch (ReflectiveOperationException e) {
-            throw new KryoException("Unable to call BitSet(long[]) constructor", e);
+        } catch (InstantiationException e) {
+            throw new KryoException("Exception thrown while creating new instance BitSetConstructor", e);
+        } catch (IllegalAccessException e) {
+            throw new KryoException("Exception thrown while creating new instance of BitSetConstructor", e);
+        } catch (InvocationTargetException e) {
+            throw new KryoException("Exception thrown while creating new instance of BitSetConstructor", e);
+        } catch (IllegalArgumentException e) {
+            throw new KryoException("Exception thrown while creating new instance of BitSetConstructor", e);
         }
         try {
             recalculateWordsInUseMethod.invoke(ret);
-        } catch (ReflectiveOperationException e) {
-            throw new KryoException("Unable to call BitSet.recalculateWordsInUse() method", e);
+        } catch (InvocationTargetException e) {
+            throw new KryoException("Exception thrown while invoking recalculateWordsInUseMethod", e);
+        } catch (IllegalAccessException e) {
+            throw new KryoException("Exception thrown while invoking recalculateWordsInUseMethod", e);
+        } catch (IllegalArgumentException e) {
+            throw new KryoException("Exception thrown while invoking recalculateWordsInUseMethod", e);
         }
-
         return ret;
     }
 }

chill-java/src/test/scala/com/twitter/chill/java/BitSetTest.scala

@@ -3,7 +3,7 @@ package com.twitter.chill.java
 import java.util
 
 import com.esotericsoftware.kryo.Kryo
-import com.esotericsoftware.kryo.io.{Input, Output}
+import com.esotericsoftware.kryo.io.{ Input, Output }
 import org.objenesis.strategy.StdInstantiatorStrategy
 import org.scalatest._
 
@@ -63,19 +63,19 @@ class BitSetSpec extends WordSpec with MustMatchers {
       }
 
       // warmup In case anybody wants to see hotspot
-      var lastBitSetFromOld : util.BitSet = null
-      for(i <- 0 to 50000) {
+      var lastBitSetFromOld: util.BitSet = null
+      for (i <- 0 to 50000) {
         lastBitSetFromOld = rt(element)(oldKryo)
       }
       var start = System.currentTimeMillis()
-      for(i <- 0 to 100000) {
+      for (i <- 0 to 100000) {
         rt(element)(oldKryo)
       }
-      println("The old serializer took "+(System.currentTimeMillis() - start)+"ms")
+      println("The old serializer took " + (System.currentTimeMillis() - start) + "ms")
 
-      var lastBitSetFromNew : util.BitSet = null
+      var lastBitSetFromNew: util.BitSet = null
       // warmup for the new kryo
-      for(i <- 0 to 50000) {
+      for (i <- 0 to 50000) {
         lastBitSetFromNew = rt(element)(newKryo)
       }
       // check for the three bitsets to be equal
@@ -87,23 +87,22 @@ class BitSetSpec extends WordSpec with MustMatchers {
         element.get(i) must be(lastBitSetFromNew.get(i))
       }
 
-
       start = System.currentTimeMillis()
-      for(i <- 0 to 100000) {
+      for (i <- 0 to 100000) {
         rt(element)(newKryo)
       }
-      println("The new serializer took "+(System.currentTimeMillis() - start)+"ms")
+      println("The new serializer took " + (System.currentTimeMillis() - start) + "ms")
 
       var out = new Output(1, -1)
       oldKryo.writeObject(out, element)
       out.flush()
       var oldBytes = out.total()
-      println("The old serializer needs "+oldBytes+" bytes")
+      println("The old serializer needs " + oldBytes + " bytes")
       out = new Output(1, -1)
       newKryo.writeObject(out, element)
       out.flush()
       var newBytes = out.total()
-      println("The new serializer needs "+newBytes+" bytes")
+      println("The new serializer needs " + newBytes + " bytes")
 
       oldBytes >= newBytes must be(true)
     }

chill-scala/src/main/scala/com/twitter/chill/ScalaKryoInstantiator.scala

@@ -123,6 +123,8 @@ class ScalaCollectionsRegistrar extends IKryoRegistrar {
       .forTraversableSubclass(Queue.empty[Any])
       // List is a sealed class, so there are only two subclasses:
       .forTraversableSubclass(List.empty[Any])
+      // Add ListBuffer subclass before Buffer to prevent the more general case taking precedence
+      .forTraversableSubclass(ListBuffer.empty[Any], isImmutable = false)
       // add mutable Buffer before Vector, otherwise Vector is used
       .forTraversableSubclass(Buffer.empty[Any], isImmutable = false)
       // Vector is a final class
@@ -159,7 +161,6 @@ class ScalaCollectionsRegistrar extends IKryoRegistrar {
       .forTraversableSubclass(MQueue.empty[Any], isImmutable = false)
       .forTraversableSubclass(MMap.empty[Any, Any], isImmutable = false)
       .forTraversableSubclass(MSet.empty[Any], isImmutable = false)
-      .forTraversableSubclass(ListBuffer.empty[Any], isImmutable = false)
   }
 }
 

project/Build.scala

@@ -12,18 +12,18 @@ import scala.collection.JavaConverters._
 object ChillBuild extends Build {
   val kryoVersion = "2.21"
 
+  val bijectionVersion = "0.8.1"
+  val algebirdVersion = "0.11.0"
 
   def isScala210x(scalaVersion: String) = scalaVersion match {
       case version if version startsWith "2.10" => true
       case _ => false
   }
 
   val sharedSettings = Project.defaultSettings ++ mimaDefaultSettings ++ scalariformSettings ++ Seq(
-
-    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
+      }
+      )
     )
   }
 
@@ -145,7 +150,7 @@ object ChillBuild extends Build {
     settings = sharedSettings
   ).settings(
     name := "chill",
-    previousArtifact := Some("com.twitter" % "chill_2.10" % "0.5.0")
+    previousArtifact := Some("com.twitter" % "chill_2.10" % "0.7.0")
   ).dependsOn(chillJava)
 
   lazy val chillAkka = module("akka").settings(
@@ -201,8 +206,8 @@ object ChillBuild extends Build {
 
   lazy val chillScrooge = module("scrooge").settings(
     libraryDependencies ++= Seq(
-      "org.apache.thrift" % "libthrift" % "0.9.1" exclude("junit", "junit"),
-      "com.twitter" %% "scrooge-serializer" % "3.17.0"
+      "org.apache.thrift" % "libthrift" % "0.6.1" exclude("junit", "junit"),
+      "com.twitter" %% "scrooge-serializer" % "3.20.0"
     )
   ).dependsOn(chill % "test->test;compile->compile")
 

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.5
+sbt.version=0.13.8

version.sbt

@@ -0,0 +1 @@
+version in ThisBuild := "0.7.0"