Skip to content

Fresh cherry-pick of the Scala 2.12 support (#304) #472

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

Merged
merged 1 commit into from
Apr 24, 2018

Conversation

gkk-stripe
Copy link
Contributor

This targets master to show it's one simple commit on top of master. It should be merged to scala_2.12

I had a spare minute and saw comments asking for 2.12 branch. I cherry-picked the original commit for 2.12 branch to start with a clean slate.

Below are original comments from the commit

  • Scala 2.12 updates

Bump dependencies to versions that support Scala 2.12.

  • Fix incompatible scrooge api change.

They swapped the logger interface and now there's a different went to
silence the logging.

  • Add scalactic as a transitive dep of scalatest

Newer versions of scalatest have scalactic as a dependency. Let bazel
know about it and add its a transitive dep.

  • Add a missing dependency on util_core from scrooge rule

Add a missing dependency on Twitter's util_core from scrooge rule

Switch to a recent nightly build that has a fix for the flat classpath
caching bug that is breaking bazel's incremental compilation when worker
is enabled.

See #251 (comment)
for the details of the bug.

  • Disable jmh test

See #295 for why it's
failing.

  • Append YdisableFlatCpCaching to scalacopts by default

Append the YdisableFlatCpCaching compiler option by default as a
workaround to #305

cc @ittaiz @johnynek @andyscott

@johnynek
Copy link
Contributor

johnynek commented Apr 3, 2018

we have the wrong base branch here. we don't want to merge into master. Can you change the PR into scala 2.12 branch?

@gkk-stripe
Copy link
Contributor Author

this targets the right branch: i wanted to show the diff is small, to target 2_2.12, we would need to reset it first to master

@johnynek
Copy link
Contributor

johnynek commented Apr 4, 2018

@gkk-stripe but we shouldn't merge this, right?

@gkk-stripe
Copy link
Contributor Author

no, we shouldn't, to make the story straight: I think we should start 2_12 branch from scratch; the diff between master and 2_12 will be small as this pr demonstrates

@gkk-stripe
Copy link
Contributor Author

if we get agreement on starting from scratch, I can open a pr against the reset 2_12 branch

@ittaiz
Copy link
Contributor

ittaiz commented Apr 5, 2018 via email

@gkossakowski
Copy link

we could archive the current head of the branch as a separate branch and reset this one; this way commits won't be GCed

@johnynek
Copy link
Contributor

johnynek commented Apr 5, 2018

let's make a new branch but put the old commits in that branch, then reuse the current branch name, which is a better name, for the latest and greatest.

@gkk-stripe
Copy link
Contributor Author

shall we proceed with the branch for the old commits and push this over?

@johnynek
Copy link
Contributor

I created: https://github.com/bazelbuild/rules_scala/tree/scala2_12_ver0

which is the current scala2_12

now, can we change this commit to go into scala2_12?

@ittaiz
Copy link
Contributor

ittaiz commented Apr 18, 2018 via email

* Scala 2.12 updates

Bump dependencies to versions that support Scala 2.12.

* Fix incompatible scrooge api change.

They swapped the logger interface and now there's a different went to
silence the logging.

* Add scalactic as a transitive dep of scalatest

Newer versions of scalatest have scalactic as a dependency. Let bazel
know about it and add its a transitive dep.

* Add a missing dependency on util_core from scrooge rule

Add a missing dependency on Twitter's util_core from scrooge rule

Switch to a recent nightly build that has a fix for the flat classpath
caching bug that is breaking bazel's incremental compilation when worker
is enabled.

See bazel-contrib#251 (comment)
for the details of the bug.
* Disable jmh test

See bazel-contrib#295 for why it's
failing.

* Append YdisableFlatCpCaching to scalacopts by default

Append the `YdisableFlatCpCaching` compiler option by default as a
workaround to bazel-contrib#305
@gkk-stripe gkk-stripe changed the base branch from master to scala2_12 April 18, 2018 20:09
@gkk-stripe
Copy link
Contributor Author

@johnynek i changed the base to scala_2.12 but it's behind master so the PR appears to be large; can you force push master to scala_2.12 and we'll merge the one cherry-picked commit?

@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@johnynek
Copy link
Contributor

johnynek commented Apr 19, 2018 via email

@gkk-stripe
Copy link
Contributor Author

this is ready for merge

@johnynek
Copy link
Contributor

thanks @gkk-stripe !

@johnynek johnynek merged commit a591211 into bazel-contrib:scala2_12 Apr 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants