Upgrade to 2.13.0 (and the new collections)

build.sbt

@@ -1,9 +1,11 @@
 import ScalaModulePlugin._
 
+resolvers in ThisBuild += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-integration/"
+
 scalaVersionsByJvm in ThisBuild := {
   val v211 = "2.11.12"
   val v212 = "2.12.4"
-  val v213 = "2.13.0-M3"
+  val v213 = "2.13.0-pre-66da69b"
 
   Map(
     6 -> List(v211 -> true),
@@ -38,7 +40,15 @@ lazy val `scala-parser-combinators` = crossProject.in(file(".")).
       "Scala Parser Combinators",
       "-doc-version",
       version.value
-    )
+    ),
+    unmanagedSourceDirectories in Compile ++= {
+      (unmanagedSourceDirectories in Compile).value.map { dir =>
+        CrossVersion.partialVersion(scalaVersion.value) match {
+          case Some((2, 13)) => file(dir.getPath ++ "-2.13")
+          case _             => file(dir.getPath ++ "-2.11-2.12")
+        }
+      }
+    }
   ).
   jvmSettings(
     OsgiKeys.exportPackage := Seq(s"scala.util.parsing.*;version=${version.value}"),

jvm/src/test/scala/scala/util/parsing/combinator/t4929.scala

@@ -1,6 +1,6 @@
 import scala.util.parsing.json._
 import java.util.concurrent._
-import collection.JavaConversions._
+import collection.JavaConverters._
 
 import org.junit.Test
 
@@ -36,6 +36,6 @@ class t4929 {
       thread.setDaemon(true)
       thread.start()
     }
-    errors foreach { throw(_) }
+    errors.asScala foreach { throw(_) }
   }
 }

shared/src/main/scala-2.11-2.12/scala/util/parsing/input/ScalaVersionSpecificPagedSeq.scala

@@ -0,0 +1,5 @@
+package scala.util.parsing.input
+
+private[input] trait ScalaVersionSpecificPagedSeq[T] {
+  // Nothing for 2.11 and 2.12!
+}

shared/src/main/scala-2.13/scala/util/parsing/input/ScalaVersionSpecificPagedSeq.scala

@@ -0,0 +1,7 @@
+package scala.util.parsing.input
+
+private[input] trait ScalaVersionSpecificPagedSeq[T] { self: PagedSeq[T] =>
+  // Members declared in scala.collection.Seq
+  override def iterableFactory: collection.SeqFactory[collection.IndexedSeq] = collection.IndexedSeq
+
+}

shared/src/main/scala/scala/util/parsing/input/PagedSeq.scala

@@ -129,6 +129,7 @@ class PagedSeq[T: ClassTag] protected(
   end: Int)
 extends scala.collection.AbstractSeq[T]
    with scala.collection.IndexedSeq[T]
+   with ScalaVersionSpecificPagedSeq[T]
 {
   def this(more: (Array[T], Int, Int) => Int) = this(more, new Page[T](0), 0, UndeterminedEnd)
 

shared/src/test/scala/scala/util/parsing/combinator/UnitTestIO.scala

@@ -26,7 +26,7 @@ class UnitTestIO {
     val s = "Here is a test string"
     val f = io.Source.fromBytes(s.getBytes("utf-8"))
     val b = new collection.mutable.ArrayBuffer[Char]()
-    f.copyToBuffer(b)
+    b ++= f
     assertEquals(new String(b.toArray), s)
   }
 }