Changes for the 0.7.0 release of chill

Author: ianoc

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

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)
     }

project/Build.scala

@@ -12,15 +12,15 @@ 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.7"),
@@ -150,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(

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"