Backport 2.12 to 0.7.x branch (#274)

* Backport 2.12 to 0.7.x branch

* Fix the binary version for mima

* Fix closure cleaner tests

* Bump sbt-release plugin version

Author: johnynek

.travis.yml

@@ -1,11 +1,37 @@
 language: scala
 sudo: false
-scala:
-  - 2.10.5
-  - 2.11.7
-jdk:
-  - openjdk6
-  - oraclejdk7
-  - oraclejdk8
-script: ./sbt ++$TRAVIS_SCALA_VERSION clean test doc
+matrix:
+  include:
+    - scala: 2.10.6
+      script: ./sbt ++$TRAVIS_SCALA_VERSION clean test mimaReportBinaryIssues
 
+    - scala: 2.11.8
+      script: ./sbt ++$TRAVIS_SCALA_VERSION clean coverage test coverageReport mimaReportBinaryIssues
+      after_success:
+        - bash <(curl -s https://codecov.io/bash)
+
+    - scala: 2.12.1
+      jdk: oraclejdk8
+      script: ./sbt "+++$TRAVIS_SCALA_VERSION clean" "+++$TRAVIS_SCALA_VERSION test" # "+++$TRAVIS_SCALA_VERSION mimaReportBinaryIssues"
+
+cache:
+  directories:
+  - $HOME/.sbt/0.13/dependency
+  - $HOME/.sbt/boot/scala*
+  - $HOME/.sbt/launchers
+  - $HOME/.ivy2/cache
+  - $HOME/.nvm
+
+before_cache:
+  - du -h -d 1 $HOME/.ivy2/cache
+  - du -h -d 2 $HOME/.sbt/
+  - find $HOME/.sbt -name "*.lock" -type f -delete
+  - find $HOME/.ivy2/cache -name "ivydata-*.properties" -type f -delete
+
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/70c0a6999346c4692935
+    on_success: change
+    on_failure: always
+    on_start: never

README.md

@@ -1,4 +1,9 @@
-## Chill [![Build Status](https://secure.travis-ci.org/twitter/chill.png)](http://travis-ci.org/twitter/chill)
+## Chill
+
+[![Build Status](https://secure.travis-ci.org/twitter/chill.png)](http://travis-ci.org/twitter/chill)
+[![Codecov branch](https://img.shields.io/codecov/c/github/twitter/chill/develop.svg?maxAge=3600)](https://codecov.io/github/twitter/chill)
+[![Latest version](https://index.scala-lang.org/twitter/chill/chill/latest.svg?color=orange)](https://index.scala-lang.org/twitter/chill/chill)
+[![Chat](https://badges.gitter.im/twitter/chill.svg)](https://gitter.im/twitter/chill?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Extensions for the [Kryo serialization library](https://github.com/EsotericSoftware/kryo) including
 serializers and a set of classes to ease configuration of Kryo in systems like Hadoop, Storm,
@@ -157,9 +162,21 @@ The latest ScalaDocs are hosted on Chill's [Github Project Page](http://twitter.
 
 Discussion occurs primarily on the [Chill mailing list](https://groups.google.com/forum/#!forum/chill-user). Issues should be reported on the [GitHub issue tracker](https://github.com/twitter/chill/issues).
 
+## Get Involved + Code of Conduct
+
+Pull requests and bug reports are always welcome!
+
+We use a lightweight form of project governance inspired by the one used by Apache projects.
+Please see [Contributing and Committership](https://github.com/twitter/analytics-infra-governance#contributing-and-committership) for our code of conduct and our pull request review process.
+The TL;DR is send us a pull request, iterate on the feedback + discussion, and get a +1 from a [Committer](COMMITTERS.md) in order to get your PR accepted.
+
+The current list of active committers (who can +1 a pull request) can be found here: [Committers](COMMITTERS.md)
+
+A list of contributors to the project can be found here: [Contributors](https://github.com/twitter/chill/graphs/contributors)
+
 ## Maven
 
-Chill modules are available on Maven Central. The current groupid and version for all modules is, respectively, `"com.twitter"` and  `0.7.4` and each scala project is published for `2.10` and `2.11`. Search [search.maven.org](http://search.maven.org/#search%7Cga%7C1%7Cchill) when in doubt.
+Chill modules are available on Maven Central. The current groupid and version for all modules is, respectively, `"com.twitter"` and  `0.8.0` and each scala project is published for `2.10`, `2.11` and `2.12`. Search [search.maven.org](http://search.maven.org/#search%7Cga%7C1%7Cchill) when in doubt.
 
 ## Authors
 
@@ -171,4 +188,4 @@ Chill modules are available on Maven Central. The current groupid and version fo
 
 Copyright 2012 Twitter, Inc.
 
-Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+Licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0).

build.sbt

@@ -1,23 +1,14 @@
-import ReleaseTransformations._
-import com.typesafe.sbt.SbtScalariform._
-import com.typesafe.tools.mima.plugin.MimaKeys._
 import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings
-import scala.collection.JavaConverters._
-import scalariform.formatter.preferences._
 
 val kryoVersion = "2.21"
-val bijectionVersion = "0.9.0"
+val bijectionVersion = "0.9.4"
 val algebirdVersion = "0.12.0"
+val akkaVersion = "2.3.6"
 
-def isScala210x(scalaVersion: String) = scalaVersion match {
-    case version if version startsWith "2.10" => true
-    case _ => false
-}
-
-val sharedSettings = Project.defaultSettings ++ mimaDefaultSettings ++ scalariformSettings ++ Seq(
+val sharedSettings = mimaDefaultSettings ++ scalariformSettings ++ Seq(
   organization := "com.twitter",
-  scalaVersion := "2.10.5",
-  crossScalaVersions := Seq("2.10.5", "2.11.7"),
+  scalaVersion := "2.11.8",
+  crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.1"),
   scalacOptions ++= Seq("-unchecked", "-deprecation"),
   ScalariformKeys.preferences := formattingPreferences,
 
@@ -30,8 +21,8 @@ val sharedSettings = Project.defaultSettings ++ mimaDefaultSettings ++ scalarifo
     Opts.resolver.sonatypeReleases
   ),
   libraryDependencies ++= Seq(
-    "org.scalacheck" %% "scalacheck" % "1.11.5" % "test",
-    "org.scalatest" %% "scalatest" % "2.2.2" % "test",
+    "org.scalacheck" %% "scalacheck" % "1.11.6" % "test",
+    "org.scalatest" %% "scalatest" % "3.0.0" % "test",
     "com.esotericsoftware.kryo" % "kryo" % kryoVersion
   ),
 
@@ -44,15 +35,12 @@ val sharedSettings = Project.defaultSettings ++ mimaDefaultSettings ++ scalarifo
   publishArtifact in Test := false,
   pomIncludeRepository := { x => false },
 
-  publishTo <<= version { v =>
-    Some(
-      if (v.trim.toUpperCase.endsWith("SNAPSHOT"))
+  publishTo := Some(
+      if (version.value.trim.toUpperCase.endsWith("SNAPSHOT"))
         Opts.resolver.sonatypeSnapshots
       else
         Opts.resolver.sonatypeStaging
-        //"twttr" at "http://artifactory.local.twitter.com/libs-releases-local"
-    )
-  },
+    ),
   pomExtra := (
     <url>https://github.com/twitter/chill</url>
         <licenses>
@@ -86,11 +74,9 @@ lazy val chillAll = Project(
   id = "chill-all",
   base = file("."),
   settings = sharedSettings
-).settings(
-  test := { },
-  publish := { },
-  publishLocal := { }
-).aggregate(
+ ).enablePlugins(CrossPerProjectPlugin)
+  .settings(noPublishSettings)
+  .aggregate(
   chill,
   chillBijection,
   chillScrooge,
@@ -111,32 +97,49 @@ lazy val formattingPreferences = {
    setPreference(PreserveSpaceBeforeArguments, true)
 }
 
+lazy val noPublishSettings = Seq(
+    publish := (),
+    publishLocal := (),
+    test := (),
+    publishArtifact := false
+  )
+
 /**
   * This returns the youngest jar we released that is compatible
   * with the current.
   */
 val unreleasedModules = Set[String]("akka")
 val javaOnly = Set[String]("storm", "java", "hadoop", "thrift", "protobuf")
+val binaryCompatVersion = "0.7.4"
 
 def youngestForwardCompatible(subProj: String) =
   Some(subProj)
     .filterNot(unreleasedModules.contains(_))
     .map { s =>
-    val suffix = if (javaOnly.contains(s)) "" else "_2.10"
-    "com.twitter" % ("chill-" + s + suffix) % "0.7.2"
+    if (javaOnly.contains(s))
+      "com.twitter" % ("chill-" + s) % binaryCompatVersion
+    else
+      "com.twitter" %% ("chill-" + s) % binaryCompatVersion
   }
 
+val ignoredABIProblems = {
+  import com.typesafe.tools.mima.core._
+  import com.typesafe.tools.mima.core.ProblemFilters._
+  Seq(
+    ProblemFilters.exclude[MissingTypesProblem]("com.twitter.chill.storm.BlizzardKryoFactory")
+  )
+}
+
 def module(name: String) = {
   val id = "chill-%s".format(name)
   Project(id = id, base = file(id), settings = sharedSettings ++ Seq(
     Keys.name := id,
-    previousArtifact := youngestForwardCompatible(name),
+    mimaPreviousArtifacts := youngestForwardCompatible(name).toSet,
+    mimaBinaryIssueFilters ++= ignoredABIProblems,
     // Disable cross publishing for java artifacts
-    publishArtifact <<= (scalaVersion) { scalaVersion =>
-      if(javaOnly.contains(name) && scalaVersion.startsWith("2.11")) false else true
-    }
-    )
-  )
+    publishArtifact :=
+      (if (javaOnly.contains(name) && scalaVersion.value.startsWith("2.11")) false else true)
+  ))
 }
 
 // We usually do the pattern of having a core module, but we don't want to cause
@@ -147,14 +150,15 @@ lazy val chill = Project(
   settings = sharedSettings
 ).settings(
   name := "chill",
-  previousArtifact := Some("com.twitter" % "chill_2.10" % "0.7.2")
+  mimaPreviousArtifacts := Set("com.twitter" %% "chill" % binaryCompatVersion)
 ).dependsOn(chillJava)
 
 lazy val chillAkka = module("akka").settings(
-  resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/",
+  resolvers += Resolver.typesafeRepo("releases"),
+  crossScalaVersions := crossScalaVersions.value.filterNot(_.startsWith("2.12")),
   libraryDependencies ++= Seq(
     "com.typesafe" % "config" % "1.2.1",
-    "com.typesafe.akka" %% "akka-actor" % "2.3.6" % "provided"
+    "com.typesafe.akka" %% "akka-actor" % akkaVersion % "provided"
   )
 ).dependsOn(chill % "test->test;compile->compile")
 
@@ -202,6 +206,7 @@ lazy val chillThrift = module("thrift").settings(
 )
 
 lazy val chillScrooge = module("scrooge").settings(
+  crossScalaVersions := crossScalaVersions.value.filterNot(_.startsWith("2.12")),
   libraryDependencies ++= Seq(
     "org.apache.thrift" % "libthrift" % "0.6.1" exclude("junit", "junit"),
     "com.twitter" %% "scrooge-serializer" % "3.20.0"
@@ -225,6 +230,7 @@ lazy val chillAvro = module("avro").settings(
 ).dependsOn(chill,chillJava, chillBijection)
 
 lazy val chillAlgebird = module("algebird").settings(
+  crossScalaVersions := crossScalaVersions.value.filterNot(_.startsWith("2.12")),
   libraryDependencies ++= Seq(
     "com.twitter" %% "algebird-core" % algebirdVersion
   )

chill-akka/src/main/scala/com/twitter/chill/akka/ActorRefSerializer.scala

@@ -17,13 +17,12 @@ package com.twitter.chill.akka
  * ****************************************************************************
  */
 
-import akka.actor.ExtendedActorSystem
-import akka.actor.ActorRef
+import akka.actor.{ ActorRef, ActorPath, ExtendedActorSystem }
 import akka.serialization.Serialization
-import com.esotericsoftware.kryo.Kryo
-import com.esotericsoftware.kryo.Serializer
-import com.esotericsoftware.kryo.io.Input
-import com.esotericsoftware.kryo.io.Output
+import com.esotericsoftware.kryo.{ Kryo, Serializer }
+import com.esotericsoftware.kryo.io.{ Input, Output }
+
+import com.twitter.chill.{ toRich, IKryoRegistrar }
 
 /**
  * *
@@ -32,9 +31,6 @@ import com.esotericsoftware.kryo.io.Output
  * @author Roman Levenstein
  * @author P. Oscar Boykin
  */
-
-import com.twitter.chill.{ toRich, IKryoRegistrar }
-
 class ActorRefSerializer(system: ExtendedActorSystem) extends Serializer[ActorRef] with IKryoRegistrar {
 
   def apply(kryo: Kryo): Unit = {
@@ -45,8 +41,8 @@ class ActorRefSerializer(system: ExtendedActorSystem) extends Serializer[ActorRe
   }
 
   override def read(kryo: Kryo, input: Input, typ: Class[ActorRef]): ActorRef = {
-    val path = input.readString()
-    system.actorFor(path)
+    val path = ActorPath.fromString(input.readString())
+    system.provider.resolveActorRef(path)
   }
 
   override def write(kryo: Kryo, output: Output, obj: ActorRef) = {

chill-akka/src/test/scala/com/twitter/chill/akka/AkkaTests.scala

@@ -18,11 +18,23 @@ package com.twitter.chill.akka
 
 import org.scalatest._
 
-import akka.actor.{ ActorRef, ActorSystem }
+import akka.actor.{ Actor, ActorRef, ActorSystem, Props }
+import akka.util.Timeout
+import scala.concurrent.Await
+import scala.concurrent.duration._
 import akka.serialization._
 import com.typesafe.config.ConfigFactory
 
 class AkkaTests extends WordSpec with Matchers {
+  object IncActor {
+    def props: Props = Props(IncActor())
+  }
+
+  case class IncActor() extends Actor {
+    def receive = {
+      case x: Int => sender() ! (x + 1)
+    }
+  }
 
   val system = ActorSystem("example", ConfigFactory.parseString("""
     akka.actor.serializers {
@@ -45,21 +57,22 @@ class AkkaTests extends WordSpec with Matchers {
       serializer.getClass.equals(classOf[AkkaSerializer]) should equal(true)
     }
 
+    def actorRef(i: Int) = system.actorOf(IncActor.props, "incActor" + i)
+
     "be selected for ActorRef" in {
-      val serializer = serialization.findSerializerFor(system.actorFor("akka://test-system/test-actor"))
+      val serializer = serialization.findSerializerFor(actorRef(1))
       serializer.getClass.equals(classOf[AkkaSerializer]) should equal(true)
     }
 
     "serialize and deserialize ActorRef successfully" in {
-      val actorRef = system.actorFor("akka://test-system/test-actor")
-
-      val serialized = serialization.serialize(actorRef)
+      val actor = actorRef(2)
+      val serialized = serialization.serialize(actor)
       serialized.isSuccess should equal(true)
 
       val deserialized = serialization.deserialize(serialized.get, classOf[ActorRef])
       deserialized.isSuccess should equal(true)
 
-      deserialized.get.equals(actorRef) should equal(true)
+      deserialized.get.equals(actor) should equal(true)
     }
 
   }