Skip to content

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

Closed
wants to merge 2 commits into from

Conversation

julienrf
Copy link
Contributor

Do not merge until 2.13 is released.

@@ -0,0 +1 @@
../../../../../scala-2.12/scala/util/parsing/input/PagedSeq.scala
Copy link
Contributor Author

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)

Copy link
Member

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

Copy link
Contributor Author

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()
Copy link
Contributor Author

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.

Copy link
Member

@lrytz lrytz Jan 22, 2018

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

@julienrf julienrf force-pushed the collection-strawman-bis branch from 784d2f3 to d8512ba Compare January 22, 2018 14:17
@gourlaysama gourlaysama closed this Feb 6, 2018
@gourlaysama gourlaysama changed the base branch from master to 1.1.x February 6, 2018 17:51
@gourlaysama gourlaysama reopened this Feb 6, 2018
Use distinct implementations of PagedSeq according to the scala version.
Use JavaConverters rather than JavaConversions.
Use ++= instead of copyToBuffer.
@julienrf julienrf force-pushed the collection-strawman-bis branch from d8512ba to bc39da6 Compare March 28, 2018 13:13
@SethTisue
Copy link
Member

is this superseded by #148?

@julienrf
Copy link
Contributor Author

Yes, indeed. Sorry I forgot that one

@julienrf julienrf closed this Apr 27, 2018
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.

4 participants