move to compat.immutable

Author: lrytz

build.sbt

@@ -22,9 +22,6 @@ lazy val `scala-collection-compat` = crossProject(JSPlatform, JVMPlatform)
     }
   )
   .jvmSettings(
-    // NOTE: if this setting is not defined, the published jar doesn't contain any classfiles.
-    // Related to https://github.com/scala/scala-parser-combinators/issues/119.
-    // TODO: what should the setting be? This library also adds classes to other (existing) packages.
     OsgiKeys.exportPackage := Seq(s"scala.collection.compat.*;version=${version.value}"),
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
   )

src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala

@@ -1,15 +1,15 @@
-package scala.collection
-package compat
+package scala.collection.compat
 
 import scala.collection.generic.CanBuildFrom
 import scala.collection.mutable.Builder
+import scala.collection.{immutable => i, mutable => m}
 
 private[compat] object CompatImpl {
   def simpleCBF[A, C](f: => Builder[A, C]): CanBuildFrom[Any, A, C] = new CanBuildFrom[Any, A, C] {
     def apply(from: Any): Builder[A, C] = apply()
     def apply(): Builder[A, C] = f
   }
 
-  type ImmutableBitSetCC[X] = ({ type L[_] = immutable.BitSet })#L[X]
-  type MutableBitSetCC[X] = ({ type L[_] = mutable.BitSet })#L[X]
+  type ImmutableBitSetCC[X] = ({ type L[_] = i.BitSet })#L[X]
+  type MutableBitSetCC[X] = ({ type L[_] = m.BitSet })#L[X]
 }

src/main/scala-2.11_2.12/scala/collection/compat/imm/ArraySeq.scala renamed to src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala

@@ -1,4 +1,4 @@
-package scala.collection.compat.imm
+package scala.collection.compat.immutable
 
 import java.util.Arrays
 

src/main/scala-2.11_2.12/scala/collection/compat/package.scala

@@ -2,6 +2,7 @@ package scala.collection
 
 import scala.collection.generic._
 import scala.reflect.ClassTag
+import scala.collection.{immutable => i, mutable => m}
 
 /** The collection compatibility API */
 package object compat {
@@ -25,10 +26,10 @@ package object compat {
   implicit def bitSetFactoryToCBF(fact: BitSetFactory[BitSet]): CanBuildFrom[Any, Int, BitSet] =
     simpleCBF(fact.newBuilder)
 
-  implicit def immutableBitSetFactoryToCBF(fact: BitSetFactory[immutable.BitSet]): CanBuildFrom[Any, Int, ImmutableBitSetCC[Int]] =
+  implicit def immutableBitSetFactoryToCBF(fact: BitSetFactory[i.BitSet]): CanBuildFrom[Any, Int, ImmutableBitSetCC[Int]] =
     simpleCBF(fact.newBuilder)
 
-  implicit def mutableBitSetFactoryToCBF(fact: BitSetFactory[mutable.BitSet]): CanBuildFrom[Any, Int, MutableBitSetCC[Int]] =
+  implicit def mutableBitSetFactoryToCBF(fact: BitSetFactory[m.BitSet]): CanBuildFrom[Any, Int, MutableBitSetCC[Int]] =
     simpleCBF(fact.newBuilder)
 
   implicit class IterableFactoryExtensionMethods[CC[X] <: GenTraversable[X]](private val fact: GenericCompanion[CC]) {
@@ -55,4 +56,5 @@ package object compat {
 
   // This really belongs into scala.collection but there's already a package object in scala-library so we can't add to it
   type IterableOnce[+X] = TraversableOnce[X]
+  val  IterableOnce     = TraversableOnce
 }

src/main/scala-2.13/scala/collection/compat/imm/package.scala renamed to src/main/scala-2.13/scala/collection/compat/immutable/package.scala

@@ -1,6 +1,6 @@
 package scala.collection.compat
 
-package object imm {
+package object immutable {
   type ArraySeq[+T] = scala.collection.immutable.ArraySeq[T]
   val ArraySeq      = scala.collection.immutable.ArraySeq
 }

src/main/scala-2.13/scala/collection/compat/package.scala

@@ -2,10 +2,11 @@ package scala.collection
 
 package object compat {
   type Factory[-A, +C] = scala.collection.Factory[A, C]
-  val Factory          = scala.collection.Factory
+  val  Factory         = scala.collection.Factory
 
   type BuildFrom[-From, -A, +C] = scala.collection.BuildFrom[From, A, C]
-  val BuildFrom                 = scala.collection.BuildFrom
+  val  BuildFrom                = scala.collection.BuildFrom
 
   type IterableOnce[+X] = scala.collection.IterableOnce[X]
+  val  IterableOnce     = scala.collection.IterableOnce
 }

src/test/scala/test/scala/collection/ArraySeqTest.scala

@@ -2,7 +2,7 @@ package test.scala.collection
 
 import org.junit.{Assert, Test}
 
-import scala.collection.compat.imm.ArraySeq
+import scala.collection.compat.immutable.ArraySeq
 
 // The unmodified ArraySeqTest from collection-strawman
 class ArraySeqTest {