diff --git a/build.sbt b/build.sbt index 0c429e5b37..b571e603b2 100644 --- a/build.sbt +++ b/build.sbt @@ -22,7 +22,7 @@ val apacheCommonsVersion = "2.2" val avroVersion = "1.7.4" val bijectionVersion = "0.9.1" val cascadingAvroVersion = "2.1.2" -val chillVersion = "0.7.3" +val chillVersion = "0.8.3" val elephantbirdVersion = "4.8" val hadoopLzoVersion = "0.4.19" val hadoopVersion = "2.5.0" diff --git a/scalding-core/src/test/scala/com/twitter/scalding/ConfigTest.scala b/scalding-core/src/test/scala/com/twitter/scalding/ConfigTest.scala index 3c86badff1..c550f32df2 100644 --- a/scalding-core/src/test/scala/com/twitter/scalding/ConfigTest.scala +++ b/scalding-core/src/test/scala/com/twitter/scalding/ConfigTest.scala @@ -69,7 +69,7 @@ class ConfigTest extends WordSpec with Matchers { Config.empty.getCascadingSerializationTokens shouldBe empty - // tokenClasses are a subset that don't include primites or arrays. + // tokenClasses are a subset that don't include primitives or arrays. val tokenClasses = Config.default.getCascadingSerializationTokens.values.toSet val kryoClasses = Config.default.getKryoRegisteredClasses.map(_.getName) // Tokens are a subset of Kryo registered classes @@ -78,7 +78,7 @@ class ConfigTest extends WordSpec with Matchers { (kryoClasses -- tokenClasses).forall { c => // primitives cannot be forName'd val prim = Set(classOf[Boolean], classOf[Byte], classOf[Short], - classOf[Int], classOf[Long], classOf[Float], classOf[Double], classOf[Char]) + classOf[Int], classOf[Long], classOf[Float], classOf[Double], classOf[Char], classOf[Unit]) .map(_.getName) prim(c) || Class.forName(c).isArray