Upgrade to Scala v2.13 #425
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rtyley
commented
Feb 13, 2021
| @@ -13,6 +13,10 @@ object Dependencies { | |||
| // the 1.7.2 here matches slf4j-api in jgit's dependencies | |||
| val slf4jSimple = "org.slf4j" % "slf4j-simple" % "1.7.2" | |||
|
|
|||
| val scalaCollectionPlus = "com.madgag" %% "scala-collection-plus" % "0.5" | |||
There was a problem hiding this comment.
See https://github.com/rtyley/scala-collection-plus, which provides mapV & groupUp
rtyley
commented
Feb 13, 2021
Comment on lines
76
to
80
| override def clear(): Unit = ??? | ||
|
|
||
| override def result(): ConcurrentSet[A] = ??? | ||
|
|
||
| override def addOne(elem: A): ConcurrentSetBuilder.this.type = ??? |
rtyley
force-pushed
the
upgrade-to-scala-v2.13
branch
6 times, most recently
from
52fa084 to
e55c037
Compare
rtyley
force-pushed
the
upgrade-to-scala-v2.13
branch
3 times, most recently
from
88869f7 to
87e4de2
Compare
Key challenges with the upgrade: * The [`scala-io`](https://github.com/jesseeichar/scala-io) library is not available for Scala 2.13 (I had custom-built the Scala 2.12 version, but it was too much effort to get it to 2.13). `scala-io` was providing several useful features: * streaming reading of character data with line-splitting that *preserves line-breaks* (because I don't want the BFG to change the line-breaks in your files while doing `--replace-text`). Finding a replacement library to do this wasn't easy - so much code seems to be based on `java.io.BufferedReader`, which throws line-breaks away. `java.util.Scanner` can _maybe_ do it, but I couldn't get it to work! In the end, I implemented my own solution, a tiny library with a fairly decent set of tests: https://github.com/rtyley/line-break-preserving-line-splitting * resource management - mostly replaced by using Scala 2.13's [`Using`](https://www.scala-lang.org/api/current/scala/util/Using$.html). * File-path types and operations - mostly now performed by java.nio & Guava functions. * Scala 2.13 has a [revised collections framework](https://docs.scala-lang.org/overviews/core/collections-migration-213.html), so: * BFG has its own `ConcurrentSet` which needs to be implemented in the new fashion * `Traversable` becomes `Iterable`, etc
rtyley
force-pushed
the
upgrade-to-scala-v2.13
branch
from
87e4de2 to
405fe42
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Key challenges with the upgrade:
scala-iolibrary is not available for Scala 2.13 (I had custom-built the Scala 2.12 version, but it was too much effort to get it to 2.13).scala-iowas providing several useful features:--replace-text). Finding a replacement library to do this wasn't easy - so much code seems to be based onjava.io.BufferedReader, which throws line-breaks away.java.util.Scannercan maybe do it, but I couldn't get it to work! In the end, I implemented my own solution, a tiny library with a fairly decent set of tests: https://github.com/rtyley/line-break-preserving-line-splittingUsing.ConcurrentSetwhich needs to be implemented in the new fashionTraversablebecomesIterable, etc