Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump chill version to 0.8.3 #1634

Merged
merged 2 commits into from
Jan 18, 2017
Merged

Bump chill version to 0.8.3 #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
508cdb1
Bump chill version to 0.8.3
Jan 17, 2017
9b657b0
Fix ConfigTest
Jan 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions scalding-core/src/test/scala/com/twitter/scalding/ConfigTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down