-
Notifications
You must be signed in to change notification settings - Fork 130
Cross compile with the new collections #134
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
Conversation
@@ -0,0 +1 @@ | |||
../../../../../scala-2.12/scala/util/parsing/input/PagedSeq.scala |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I moved PagedSeq.scala
to the src/main/scala-2.12
source directory and symlinked it from here (scala-2.11
source directory)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This probably doesn't work on Windows. Alternatively we can do something like sbt/sbt#2310
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!
|
||
// Members declared in scala.collection.IterableOps | ||
protected[this] def fromSpecificIterable(coll: collection.Iterable[T]): collection.IndexedSeq[T] = iterableFactory.from(coll) | ||
protected[this] def newSpecificBuilder(): collection.mutable.Builder[T, collection.IndexedSeq[T]] = iterableFactory.newBuilder() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The only difference with the 2.11 and 2.12 implementation is these 3 lines above that have been added.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you think about moving those methods to a separate trait in a separate source file? In versions up to 2.12 the source file trait would be empty. Then we can avoid duplicating the entire file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!
784d2f3
to
d8512ba
Compare
Use distinct implementations of PagedSeq according to the scala version. Use JavaConverters rather than JavaConversions. Use ++= instead of copyToBuffer.
d8512ba
to
bc39da6
Compare
is this superseded by #148? |
Yes, indeed. Sorry I forgot that one |
Do not merge until 2.13 is released.