Merge pull request #13 from ryan-williams/reg

custom registrations last
hammerlab · Mar 13, 2017 · 0789588 · 0789588
2 parents 075a932 + 4266ccb
commit 0789588
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ jdk:
   - oraclejdk8
 
 scala:
-  - 2.10.6
   - 2.11.8
 
 script: sbt ++$TRAVIS_SCALA_VERSION clean test

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 name := "spark-tests"
 
-version := "1.3.2"
+version := "1.3.3"
 
 libraryDependencies ++= Seq(
   libs.value('scalatest),

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.hammerlab" % "sbt-parent" % "1.6.1")
+addSbtPlugin("org.hammerlab" % "sbt-parent" % "1.7.1")
diff --git a/src/main/scala/org/hammerlab/spark/test/suite/KryoSparkSuite.scala b/src/main/scala/org/hammerlab/spark/test/suite/KryoSparkSuite.scala
@@ -79,12 +79,12 @@ class KryoSparkSuite[T <: KryoRegistrator](registrar: Class[T] = null,
    * Spark's hook for registering classes with Kryo.
    */
   override def registerClasses(kryo: Kryo): Unit = {
+    Option(registrar).foreach(_.newInstance().registerClasses(kryo))
     for {
       registration <- extraKryoRegistrations.reverseIterator
     } {
       registration.register(kryo)
     }
-    Option(registrar).foreach(_.newInstance().registerClasses(kryo))
   }
 
   conf