Skip to content

Backport 2.12 to 0.7.x branch#274

Merged
johnynek merged 4 commits into
0.7.xfrom
oscar/backport-2-12-0_7
Jan 4, 2017
Merged

Backport 2.12 to 0.7.x branch#274
johnynek merged 4 commits into
0.7.xfrom
oscar/backport-2-12-0_7

Conversation

@johnynek
Copy link
Copy Markdown
Contributor

@johnynek johnynek commented Jan 3, 2017

This brings e5afee8 to the 0.7.x (Kryo 2.21) branch.

@johnynek johnynek requested a review from sritchie January 3, 2017 22:51
@johnynek
Copy link
Copy Markdown
Contributor Author

johnynek commented Jan 3, 2017

@sritchie @isnotinvain review?

Comment thread README.md
## 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.
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we care about the README on each of these branches reflecting the 0.7.x, etc and proper kryo version?

Comment thread build.sbt
@@ -1,23 +1,14 @@
import ReleaseTransformations._
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we also going to have to backport the doge release business? I think so.


override def getRegistration(klass: Class[_]) =
if (isJavaLambda(klass)) {
getClassResolver.getRegistration(classOf[ClosureSerializer.Closure])
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, odd that this doesn't have coverage even though without it the tests failed.

Comment thread project/plugins.sbt Outdated
@@ -1,9 +1,9 @@
resolvers += Resolver.url("sbt-plugin-releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns)

addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.0")
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we'll need to bump this as well - that'll get covered by the cherry-pick, I guess.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

huh, I guess we overlooked this.

@sritchie-stripe
Copy link
Copy Markdown

Huh, on 2.12:

[info] - should clean actual closures *** FAILED ***
[info]   java.lang.IllegalArgumentException:
[info]   at com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.ClassReader.<init>(Unknown Source)
[info]   at com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.ClassReader.<init>(Unknown Source)
[info]   at com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.ClassReader.<init>(Unknown Source)
[info]   at com.twitter.chill.ClosureCleaner$.getClassReader(ClosureCleaner.scala:62)
[info]   at com.twitter.chill.ClosureCleaner$.getInnerClassesFn(ClosureCleaner.scala:112)
[info]   at com.twitter.chill.ClosureCleaner$.$anonfun$innerClassesOf$1(ClosureCleaner.scala:125)
[info]   at com.twitter.chill.ClosureCleaner$$$Lambda$1983/216374448.apply(Unknown Source)
[info]   at scala.collection.mutable.HashMap.getOrElseUpdate(HashMap.scala:79)
[info]   at com.twitter.chill.ClosureCleaner$.innerClassesOf(ClosureCleaner.scala:125)
[info]   at com.twitter.chill.ClosureCleaner$.getAccessedFields(ClosureCleaner.scala:133)
[info]   ...

override def read(kryo: Kryo, input: Input, typ: Class[ActorRef]): ActorRef = {
val path = input.readString()
system.actorFor(path)
val path = ActorPath.fromString(input.readString())
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh! Nice, I didn't realize that I DID merge these changes and that they're backwards compatible. Nice.

@sritchie-stripe
Copy link
Copy Markdown

I think there's a race on the build, kick it again but 👍 on the code

@johnynek johnynek merged commit 1591dac into 0.7.x Jan 4, 2017
@johnynek johnynek deleted the oscar/backport-2-12-0_7 branch January 4, 2017 01:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants