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.

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

Scala 2.12.0-RC2 #1415

Merged
merged 20 commits into from
Oct 25, 2016
Merged

Scala 2.12.0-RC2 #1415

merged 20 commits into from
Oct 25, 2016

Conversation

travisbrown
Copy link
Contributor

@travisbrown travisbrown commented Oct 20, 2016

This PR includes @BennyHill's changes from #1382 together with some more recent version updates and two other things:

  1. I've updated SBT to 0.13.13-RC3 and fixed the deprecated operators.
  2. I've changed the docs for Either to explain the difference in flatMap between 2.12 and the syntax provided by Cats for 2.10 and 2.11. I've also changed the tut shed that was failing the build (because it no longer failed to compile on 2.12) to an ordinary scala shed.

In addition to the usual review, here's what I see that still needs to be done:

  • Publish a new version of catalysts and remove the -SNAPSHOT here. I've got a PR open for this that I think is ready to go.
  • Decide what to do about bench. Right now it's just not included in the build, so that you have to run something like sbt bench/test if you want to confirm that it's not broken. We could use sbt-doge, or we could have some stuff in the Travis CI build to run that command on 2.10 and 2.11 only, or we could just leave it and wait for sbt-jmh to be updated for 2.12. Given that we don't publish bench and that it doesn't have any tests, my vote would be just to wait.
  • See about changing fork in test back to true. I'm not sure why it was changed in Add scala 2.12.0-RC1 #1382, but it seems fine to me to change it back. @BennyHill, can you confirm?
  • Have someone who's more familiar with the Travis CI setup confirm that there's nothing else that needs to be done.

@SethTisue SethTisue mentioned this pull request Oct 20, 2016
@travisbrown travisbrown mentioned this pull request Oct 20, 2016
13 tasks
@codecov-io
Copy link

codecov-io commented Oct 21, 2016

Current coverage is 92.16% (diff: 100%)

Merging #1415 into master will increase coverage by 0.48%

@@             master      #1415   diff @@
==========================================
  Files           240        240          
  Lines          3617       3573    -44   
  Methods        3555       3510    -45   
  Messages          0          0          
  Branches         61         63     +2   
==========================================
- Hits           3316       3293    -23   
+ Misses          301        280    -21   
  Partials          0          0          

Powered by Codecov. Last update f90245d...d5734c3

@ghost
Copy link

ghost commented Oct 22, 2016

See about changing fork in test back to true

The clue is the original kept as a comment... so for sure it was an oversight and should be reverted if possible

- 2.11.8
- 2.10.6
- 2.11.8
- 2.12.0-RC2
Copy link

Choose a reason for hiding this comment

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

delete this line as it should be in the matrix


matrix:
include:
- scala: 2.12.0-RC1
Copy link

Choose a reason for hiding this comment

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

And change this to RC2

@ghost
Copy link

ghost commented Oct 22, 2016

For bench, see this sbt/sbt-jmh#89 issue

@ghost
Copy link

ghost commented Oct 22, 2016

https://issues.scala-lang.org/browse/SI-9923 notes that the "Unused import" warning is fixed in paradise_2.12.0-RC2 so we should remove the fix setttings and methods from the build

@ghost
Copy link

ghost commented Oct 22, 2016

for https://issues.scala-lang.org/browse/SI-9931 we should action @SethTisue 's final comment:

I would suggest you comment your fix, with a link to this ticket, as it isn't obvious why the type annotations would be necessary. Otherwise it seems fine to me. Except that perhaps you might prefer the "val c = d" style fix from my comment above?

@ghost
Copy link

ghost commented Oct 22, 2016

I'll look at the catalysts PR later today,

addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.3")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.11")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.12")
Copy link

Choose a reason for hiding this comment

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

Update to 0.2.16 and it'll "just work"™, no need to additional release of the plugin for it to work with 2.12

@ktoso
Copy link

ktoso commented Oct 22, 2016

Hi there @travisbrown @BennyHill,
feel free to ping me directly on anything related sbt-jmh - happy to help 👍

In this specific case you just need to upgrade to 0.2.16 and it'll just work.
The plugin still uses "old scala" which is fine, because that's what sbt uses, and the extras library is scala version independent (pure java), so no need for cross releasing anything for 2.12 (I confirmed this by running a benchmark on 2.12.0-RC2 right now).

Happy hakking :)

@ghost
Copy link

ghost commented Oct 22, 2016

Thanks @ktoso ! I think what has happened is that I pushed an early PR for 2.12-0-RC1 that had quite a few "hacks" to just get it to compile so that others could see what was what - and I think that was about the same time that you released the new jmh.

But I think we are getting there... 😸

@ktoso
Copy link

ktoso commented Oct 22, 2016

👍
Looking forward to cats for 2.12.0-RC2, thanks for working on it! :-)

@travisbrown
Copy link
Contributor Author

Thanks, @BennyHill! I've added a comment about SI-9931, re-enabled fatal warnings and forking in tests, added bench back, and fixed the Travis CI versions. Now I think we're just waiting on Catalysts.

@travisbrown
Copy link
Contributor Author

Thanks, @ktoso—everything looks fine with 0.2.16!

@travisbrown
Copy link
Contributor Author

Okay, just pushed the catalyst update (thanks, @BennyHill). Once this succeeds I'll rebase the branch to get rid of the merge commits and then I think it'll be ready for any last review and merging.

@travisbrown travisbrown changed the title Scala 2.12.0-RC2 (do not merge) Scala 2.12.0-RC2 Oct 23, 2016
@travisbrown
Copy link
Contributor Author

Okay, tests are passing and I've just rebased, so this is ready for merging after review.

@adelbertc
Copy link
Contributor

LGTM! Thanks so much @travisbrown 👍

}
coverageMinimum := 60,
coverageFailOnMinimum := false,
coverageHighlighting := scalaBinaryVersion.value != "2.10"
Copy link

Choose a reason for hiding this comment

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

As per gitter, I would expect that this is no longer required

@ghost
Copy link

ghost commented Oct 23, 2016

I think there is a missing .configure(disableScoverage210Jvm) in laws

@travisbrown
Copy link
Contributor Author

Thanks, @BennyHill—you're right, I misunderstood what was temporary vs. permanent there. I've added back that line and it's passing locally.

@johnynek
Copy link
Contributor

👍

@non
Copy link
Contributor

non commented Oct 24, 2016

Great work! Thanks @travisbrown and @BennyHill! 👍

@adelbertc adelbertc merged commit a08b381 into typelevel:master Oct 25, 2016
@stew stew removed the in progress label Oct 25, 2016
@ktoso
Copy link

ktoso commented Oct 25, 2016

Great, cheers!

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.

8 participants