2.11.1 #97

folone · Apr 29, 2014

Re #95.
Here's some work on cross-compiling this codebase to scala 2.11.0.
The main thing here is migrating tests from specs to scalatest.
Some things to note are:

util-eval/test fails for 2.11.0
there are four ignored test cases in the util-zk (1, 2, 3, 4)

/cc @mosesn @bmdhacks

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

mosesn · Apr 29, 2014

project/Build.scala

@@ -103,13 +110,6 @@ object Util extends Build {
    libraryDependencies ++= Seq(
      "com.twitter.common" % "objectsize" % "0.0.7" % "test"
    ),
-    testOptions in Test <<= scalaVersion map {


is this bug fixed in 0.13.2?

From the description of the bug, I've got that this is the problem with specs. Now that we're not using it, I figured this could be removed. Also, MonitorSpec seems to be working just fine.

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

Looks generally good. A few things before we merge it in:

We can't use any feature that was introduced after 2.9.2 until we drop support for scala 2.9.2. It will take a little while to do this, since Twitter still uses 2.9.2 in some places.
Why are the util-zk tests broken? How can we help you fix them?
All of the tests should have the @RunWith[JUnitRunner] annotation.
We've historically called tests that were written with specs XSpec.scala and ones written with scalatest XTest.scala, so could you rename all of the tests that now use ScalaTest to end with Test.scala instead of Spec.scala?
There are a few places where your word find/replace were a little overzealous and renamed variable names or comments.

mosesn · Apr 29, 2014

Looks generally good. A few things before we merge it in:

We can't use any feature that was introduced after 2.9.2 until we drop support for scala 2.9.2. It will take a little while to do this, since Twitter still uses 2.9.2 in some places.
Why are the util-zk tests broken? How can we help you fix them?
All of the tests should have the @RunWith[JUnitRunner] annotation.
We've historically called tests that were written with specs XSpec.scala and ones written with scalatest XTest.scala, so could you rename all of the tests that now use ScalaTest to end with Test.scala instead of Spec.scala?
There are a few places where your word find/replace were a little overzealous and renamed variable names or comments.

mosesn · Apr 29, 2014

mosesn reviewed Apr 29, 2014

View changes

I'll address the issues and will let you know when I'm done.
Concerning the util-zk tests, it seems like they use jmock testing cycle, which I failed to reproduce in those places. Will see if JMockCycle can help there.

folone · Apr 30, 2014

I'll address the issues and will let you know when I'm done.
Concerning the util-zk tests, it seems like they use jmock testing cycle, which I failed to reproduce in those places. Will see if JMockCycle can help there.

Hmm, maybe it would be simpler to just keep everything on mockito and rephrase the test slightly?

mosesn · Apr 30, 2014

Hmm, maybe it would be simpler to just keep everything on mockito and rephrase the test slightly?

@mosesn Thanks for your comments, I've addressed them in folone@674b9f7. There's one particular difference between 2.9 and 2.11 that causes code duplication in util-collection: collection wrappers have been moved from scala.collection.JavaConversions to collection.convert.Wrappers (both work in 2.10 with first being deprecated). Therefore I used this trick with scala-2.11, scala-2.10 and scala-2.9.2 directories under util-collection/src/main.

folone · May 3, 2014

@mosesn Thanks for your comments, I've addressed them in folone@674b9f7. There's one particular difference between 2.9 and 2.11 that causes code duplication in util-collection: collection wrappers have been moved from scala.collection.JavaConversions to collection.convert.Wrappers (both work in 2.10 with first being deprecated). Therefore I used this trick with scala-2.11, scala-2.10 and scala-2.9.2 directories under util-collection/src/main.

Instead of the different source directories, can we just use JavaConverters instead of JavaConversions?

Were you able to fix the util-zk problem?

mosesn · May 4, 2014

Instead of the different source directories, can we just use JavaConverters instead of JavaConversions?

Were you able to fix the util-zk problem?

Will have a look, thanks for pointing out. Haven't gotten to util-zk yet.

folone · May 5, 2014

Will have a look, thanks for pointing out. Haven't gotten to util-zk yet.

Sorry for the long radio silence: had a lot on my plate recently. I've updated the code to use JavaConverters rather then JavaConversions.

folone · May 14, 2014

Sorry for the long radio silence: had a lot on my plate recently. I've updated the code to use JavaConverters rather then JavaConversions.

Rad, let me know if there's anything I can do to help with the rest of the util-zk tests.

mosesn · May 14, 2014

Rad, let me know if there's anything I can do to help with the rest of the util-zk tests.

There. The same trick with encapsulating common logic into Helper class worked. Sorry for taking so long.

folone · May 15, 2014

There. The same trick with encapsulating common logic into Helper class worked. Sorry for taking so long.

Awesome! Because this is so big, it will probably take us a little while to churn through reading it all, but thanks so much!

mosesn · May 16, 2014

Awesome! Because this is so big, it will probably take us a little while to churn through reading it all, but thanks so much!

mosesn · May 16, 2014

mosesn reviewed May 16, 2014

View changes

mosesn · May 16, 2014

project/Build.scala

@@ -9,24 +9,35 @@ object Util extends Build {
    ExclusionRule("com.sun.jmx", "jmxri"),
    ExclusionRule("javax.jms", "jms")
  )
+  val scalatest = scalaVersion(sv => sv match {
+    case "2.9.2" => "org.scalatest" %% "scalatest" % "1.9.2"


hurk! looks like scalatest dropped support for 2.9.2? good thing we're moving off soon (finally)

mosesn · May 16, 2014

mosesn reviewed May 16, 2014

View changes

mosesn · May 16, 2014

mosesn reviewed May 16, 2014

View changes

mosesn · May 16, 2014

project/Build.scala

    ),
+    libraryDependencies <+= scalatest(_ % "test"),


can we move the _ % "test" just into the scalatest val? also, I think we can just put scalatest into the Seq of libraryDependencies.

I did this because all repos' tests depend on scalatest, but for util-logging it is a compile-time dependency because of TestLogging.scala.

ah, got it.

mosesn · May 16, 2014

mosesn reviewed May 16, 2014

View changes

mosesn · May 16, 2014

util-eval/src/test/scala/com/twitter/util/EvalTest.scala

@@ -1,27 +1,31 @@
 package com.twitter.util


@bmdhacks I think this fails on 2.11, so we have to figure out what to do about it.

Lemme look into it. If it's an easy port we might just kick that can down the road.

🚢 it! Other than a few nits.

I'd prefer for the smaller tests to be FunSuite instead of WordSpec for faster compile times, but that's something we can do in a future PR. It's fine as is.

(edited for clarity)

mosesn · May 16, 2014

🚢 it! Other than a few nits.

I'd prefer for the smaller tests to be FunSuite instead of WordSpec for faster compile times, but that's something we can do in a future PR. It's fine as is.

(edited for clarity)

I'm ok with WordSpec for now.

bmdhacks · May 16, 2014

I'm ok with WordSpec for now.

Yeah, me too. Happy shipping as is.

mosesn · May 16, 2014

Yeah, me too. Happy shipping as is.

bmdhacks · May 19, 2014

bmdhacks reviewed May 19, 2014

View changes

Awesome, I really want to get this in, I'll look at it today.

bmdhacks · May 22, 2014

Awesome, I really want to get this in, I'll look at it today.

I'm shepherding this through our internal submit process. Can't tell you how awesome this contribution is.

bmdhacks · May 23, 2014

I'm shepherding this through our internal submit process. Can't tell you how awesome this contribution is.

Awesome, let me know if you need me to make any changes.

folone · May 23, 2014

Awesome, let me know if you need me to make any changes.

Util master is a bit ahead of this patch. I've moved it forward but I'm running into trouble with com.twitter.logging.TestLogging since it uses specs as part of its API. Technically this means that removing specs is an API breaking change. Not sure what to do about that.

bmdhacks · May 28, 2014

Util master is a bit ahead of this patch. I've moved it forward but I'm running into trouble with com.twitter.logging.TestLogging since it uses specs as part of its API. Technically this means that removing specs is an API breaking change. Not sure what to do about that.

Yeah, I completely removed specs and updated TestLogging to expose scalatest API instead.

folone · Jun 2, 2014

Yeah, I completely removed specs and updated TestLogging to expose scalatest API instead.

I'm looking to get this up to 2.11. How's it coming along? Anything I can help with?

adamdecaf · Jul 1, 2014

I'm looking to get this up to 2.11. How's it coming along? Anything I can help with?

@adamdecaf this is basically blocked on me at this point. @bmdhacks has mostly wrestled it through CI, and I'm going to take it over the finish line. I'm going to try to get it in this week.

If you're interested in helping with the rest of the stack, we'd appreciate it if you took a stab at pieces of finagle that are still using specs.

mosesn · Jul 1, 2014

@adamdecaf this is basically blocked on me at this point. @bmdhacks has mostly wrestled it through CI, and I'm going to take it over the finish line. I'm going to try to get it in this week.

If you're interested in helping with the rest of the stack, we'd appreciate it if you took a stab at pieces of finagle that are still using specs.

Glorious news! This has been merged internally. We'll close this ticket after the change has been merged back into github.

If you have questions about how to move forward with 2.11 compat, I'll be your point of contact for now, and @bmdhacks will return to being the 2.11 guru when he's back from his honeymoon.

@folone your name will be sung for innumerable generations. If you ever find yourself in SF or NYC, hit us up. You are owed many beers.

mosesn · Jul 2, 2014

Glorious news! This has been merged internally. We'll close this ticket after the change has been merged back into github.

If you have questions about how to move forward with 2.11 compat, I'll be your point of contact for now, and @bmdhacks will return to being the 2.11 guru when he's back from his honeymoon.

@folone your name will be sung for innumerable generations. If you ever find yourself in SF or NYC, hit us up. You are owed many beers.

Looking forward to having util and finagle release for 2.11!

folone · Jul 2, 2014

Looking forward to having util and finagle release for 2.11!

+1

joegaudet · Jul 9, 2014

+1

On Wed, Jul 9, 2014 at 11:33 AM, Joe Gaudet notifications@github.com
wrote:

+1

Reply to this email directly or view it on GitHub:
#97 (comment)

electricmonk · Jul 9, 2014

+1

On Wed, Jul 9, 2014 at 11:33 AM, Joe Gaudet notifications@github.com
wrote:

+1

Reply to this email directly or view it on GitHub:
#97 (comment)

This is in master, but we had a small hiccup with figuring out what to do with util-eval, so we were still unable to publish 2.11. Sorry! We're working on a solution right now. 😬

In the mean time, I'm going to close this PR. Thanks for the contribution!

mosesn · Aug 8, 2014

This is in master, but we had a small hiccup with figuring out what to do with util-eval, so we were still unable to publish 2.11. Sorry! We're working on a solution right now. 😬

In the mean time, I'm going to close this PR. Thanks for the contribution!

@mosesn So once you folks figure out util-eval issues, it'll be possible to just add 2.11 to cross-build targets, and everything would just work™, right?

folone · Aug 8, 2014

@mosesn So once you folks figure out util-eval issues, it'll be possible to just add 2.11 to cross-build targets, and everything would just work™, right?

Yep!

mosesn · Aug 8, 2014

Yep!

Sounds great! Thanks a lot! Do you have any kind of estimates on when to expect 2.11 version?

folone · Aug 8, 2014

Sounds great! Thanks a lot! Do you have any kind of estimates on when to expect 2.11 version?

Nothing hard yet, but my guess would be in a couple of weeks.

mosesn · Aug 8, 2014

Nothing hard yet, but my guess would be in a couple of weeks.

Great, thanks!

folone · Aug 10, 2014

Great, thanks!

@mosesn What's the new ETA on this?

jedesah · Aug 22, 2014

@mosesn What's the new ETA on this?

@jedesah we're still on track. I'll let you know if something goes wrong. Thanks for checking in!

mosesn · Aug 22, 2014

@jedesah we're still on track. I'll let you know if something goes wrong. Thanks for checking in!

It has been closed and released from sonatype. It should be synced to maven central shortly.

mosesn · Aug 23, 2014

It has been closed and released from sonatype. It should be synced to maven central shortly.

It's there! (๑>ᴗ<๑) big shoutout to @folone!

mosesn · Aug 23, 2014

It's there! (๑>ᴗ<๑) big shoutout to @folone!

(｡´∀｀)ﾉ
Thanks @mosesn @bmdhacks!

folone · Aug 23, 2014

(｡´∀｀)ﾉ
Thanks @mosesn @bmdhacks!

Address code review.
- *Spec -> *Test - RunWith(classOf[JUnitRunner]) - Add 2.9.2 to cross-compile targets

674b9f7

Use JavaConverters instead of JavaConversions.

1b19e25

mtgto referenced this pull request May 12, 2014
Closed
Publish a 2.11.0 version #7

Fix remaining tests.

9b40276

bmdhacks closed this May 16, 2014

bmdhacks reopened this May 16, 2014

Address review comments.

5a26ad4

folone added some commits May 22, 2014

Using `assert` instead of `should` matchers.

140a545

Fix tests for 2.9.2.

515ae6f

bajohns referenced this pull request Jun 9, 2014
Closed
Scala 2.11 support #129

folone changed the title from 2.11.0 to 2.11.1 Jun 18, 2014

Update the build:
* Add -Xfuture flag to simplify going forward in the future * Update scala version (2.11.0 -> 2.11.1) * Update sbt version (0.13.2 -> 0.13.5).

4b78f69

adamdecaf referenced this pull request Jul 2, 2014
Closed
Removing specs usage from the CookieMapSpec. #289

mosesn closed this Aug 8, 2014

smarter pushed a commit to smarter/twitter-util that referenced this pull request Aug 12, 2018

Merge pull request #97 from eed3si9n/wip/hash
Tracked fixes

a09cd42

twitter/util

Join GitHub today

2.11.1 #97

Conversation

folone commented Apr 29, 2014

folone and others added some commits Apr 25, 2014

mosesn reviewed Apr 29, 2014 View changes

mosesn reviewed Apr 29, 2014 View changes

This comment has been minimized.

This comment has been minimized.

mosesn reviewed Apr 29, 2014 View changes

mosesn reviewed Apr 29, 2014 View changes

mosesn reviewed Apr 29, 2014 View changes

mosesn reviewed Apr 29, 2014 View changes

mosesn reviewed Apr 29, 2014 View changes

mosesn reviewed Apr 29, 2014 View changes

mosesn reviewed Apr 29, 2014 View changes

mosesn reviewed Apr 29, 2014 View changes

mosesn reviewed Apr 29, 2014 View changes

mosesn reviewed Apr 29, 2014 View changes

mosesn reviewed Apr 29, 2014 View changes

mosesn reviewed Apr 29, 2014 View changes

This comment has been minimized.

mosesn commented Apr 29, 2014

mosesn reviewed Apr 29, 2014 View changes

This comment has been minimized.

folone commented Apr 30, 2014

This comment has been minimized.

mosesn commented Apr 30, 2014

This comment has been minimized.

folone commented May 3, 2014

This comment has been minimized.

mosesn commented May 4, 2014

This comment has been minimized.

folone commented May 5, 2014

mtgto referenced this pull request May 12, 2014

This comment has been minimized.

folone commented May 14, 2014

This comment has been minimized.

mosesn commented May 14, 2014

This comment has been minimized.

folone commented May 15, 2014

This comment has been minimized.

mosesn commented May 16, 2014

mosesn reviewed May 16, 2014 View changes

This comment has been minimized.

mosesn reviewed May 16, 2014 View changes

mosesn reviewed May 16, 2014 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

mosesn reviewed May 16, 2014 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

mosesn commented May 16, 2014

bmdhacks closed this May 16, 2014

bmdhacks reopened this May 16, 2014

This comment has been minimized.

bmdhacks commented May 16, 2014

This comment has been minimized.

mosesn commented May 16, 2014

bmdhacks reviewed May 19, 2014 View changes

folone added some commits May 22, 2014

This comment has been minimized.

bmdhacks commented May 22, 2014

This comment has been minimized.

bmdhacks commented May 23, 2014

This comment has been minimized.

folone commented May 23, 2014

This comment has been minimized.

bmdhacks commented May 28, 2014

This comment has been minimized.

folone commented Jun 2, 2014

bajohns referenced this pull request Jun 9, 2014

folone changed the title from 2.11.0 to 2.11.1 Jun 18, 2014

This comment has been minimized.

adamdecaf commented Jul 1, 2014

This comment has been minimized.

mosesn commented Jul 1, 2014

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed Apr 29, 2014

View changes

mosesn reviewed May 16, 2014

View changes

mosesn reviewed May 16, 2014

View changes

mosesn reviewed May 16, 2014

View changes

mosesn reviewed May 16, 2014

View changes

bmdhacks reviewed May 19, 2014

View changes