-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Backports #3133 to scala_2.11 #3134
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
Backports #3133 to scala_2.11 #3134
Conversation
jackcviers
commented
Nov 9, 2019
- Adds scala version specific src directories
- Backports PR Fix NonEmptyChain.fromSeq signature on 2.12 #3133 to add scala 2.11 support
7186a6d
to
60808a8
Compare
Codecov Report
@@ Coverage Diff @@
## scala_2.11 #3134 +/- ##
==========================================
Coverage 93.4% 93.4%
==========================================
Files 382 382
Lines 7155 7155
Branches 195 194 -1
==========================================
Hits 6683 6683
Misses 472 472
Continue to review full report at Codecov.
|
This looks reasonable to me, but I think we should wait for #3133 to be merged. It would also probably be easier to backport features in the order they were added to post-2.0.0 master, but I don't think that should necessarily block this PR. (Also, relatedly, I think it'd be better to separate the Scalafmt update commit from the other part.) |
Wait, this doesn't need Scala-version-specific code because the |
Sure, I can remove the 2.11 branch and seperate out the build parts. It wasn't passing the scalafmt build step on travis, so I added it in. |
Also, I put in the 2.11, 2.12, and 2.13+ source directories in so that if you ever did want to merge the 2.11 back into master, that would be possible without a great deal of trouble. I have to wonder, why not simply have a 2.11 source directory on master where all code changes go for 2.11, rather than a full branch? The way it is, you will have to maintain tags for two branches going forward. |
@jackcviers That would involve a lot of code duplication, and the plan is to drop 2.11 entirely very soon. |
This pr follows PR typelevel#3137
* Adds scala version specific src directories * Backports PR typelevel#3133 to add scala 2.11 support * Brings scalafmt plugin and configs utd with master
60808a8
to
a6e8629
Compare
I'm closing all 2.11-related tickets since there is not enough community interest in further releases. |