diff --git a/build.sbt b/build.sbt index dab1f19..5e846dd 100644 --- a/build.sbt +++ b/build.sbt @@ -1,13 +1,9 @@ import sbtcrossproject.CrossPlugin.autoImport.{CrossType, crossProject} -// With CrossType.Pure, the root project also picks up the sources in `src` -Compile/sources := Nil -Test/sources := Nil - lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform) .withoutSuffixFor(JVMPlatform) .crossType(CrossType.Pure) - .in(file(".")) + .in(file("collection-contrib")) .settings(ScalaModulePlugin.scalaModuleSettings) // as per #71, we are not currently attempting to support OSGi in this repo .disablePlugins(SbtOsgi) diff --git a/src/main/scala/scala/collection/MultiDict.scala b/collection-contrib/src/main/scala/scala/collection/MultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/MultiDict.scala rename to collection-contrib/src/main/scala/scala/collection/MultiDict.scala diff --git a/src/main/scala/scala/collection/MultiSet.scala b/collection-contrib/src/main/scala/scala/collection/MultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/MultiSet.scala rename to collection-contrib/src/main/scala/scala/collection/MultiSet.scala diff --git a/src/main/scala/scala/collection/SortedMultiDict.scala b/collection-contrib/src/main/scala/scala/collection/SortedMultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/SortedMultiDict.scala rename to collection-contrib/src/main/scala/scala/collection/SortedMultiDict.scala diff --git a/src/main/scala/scala/collection/SortedMultiSet.scala b/collection-contrib/src/main/scala/scala/collection/SortedMultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/SortedMultiSet.scala rename to collection-contrib/src/main/scala/scala/collection/SortedMultiSet.scala diff --git a/src/main/scala/scala/collection/decorators/BitSetDecorator.scala b/collection-contrib/src/main/scala/scala/collection/decorators/BitSetDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/BitSetDecorator.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/BitSetDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/IterableDecorator.scala b/collection-contrib/src/main/scala/scala/collection/decorators/IterableDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/IterableDecorator.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/IterableDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/IteratorDecorator.scala b/collection-contrib/src/main/scala/scala/collection/decorators/IteratorDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/IteratorDecorator.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/IteratorDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/MapDecorator.scala b/collection-contrib/src/main/scala/scala/collection/decorators/MapDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/MapDecorator.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/MapDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/MutableBitSetDecorator.scala b/collection-contrib/src/main/scala/scala/collection/decorators/MutableBitSetDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/MutableBitSetDecorator.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/MutableBitSetDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/SeqDecorator.scala b/collection-contrib/src/main/scala/scala/collection/decorators/SeqDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/SeqDecorator.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/SeqDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/package.scala b/collection-contrib/src/main/scala/scala/collection/decorators/package.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/package.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/package.scala diff --git a/src/main/scala/scala/collection/decorators/views.scala b/collection-contrib/src/main/scala/scala/collection/decorators/views.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/views.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/views.scala diff --git a/src/main/scala/scala/collection/immutable/MultiDict.scala b/collection-contrib/src/main/scala/scala/collection/immutable/MultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/immutable/MultiDict.scala rename to collection-contrib/src/main/scala/scala/collection/immutable/MultiDict.scala diff --git a/src/main/scala/scala/collection/immutable/MultiSet.scala b/collection-contrib/src/main/scala/scala/collection/immutable/MultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/immutable/MultiSet.scala rename to collection-contrib/src/main/scala/scala/collection/immutable/MultiSet.scala diff --git a/src/main/scala/scala/collection/immutable/SortedMultiDict.scala b/collection-contrib/src/main/scala/scala/collection/immutable/SortedMultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/immutable/SortedMultiDict.scala rename to collection-contrib/src/main/scala/scala/collection/immutable/SortedMultiDict.scala diff --git a/src/main/scala/scala/collection/immutable/SortedMultiSet.scala b/collection-contrib/src/main/scala/scala/collection/immutable/SortedMultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/immutable/SortedMultiSet.scala rename to collection-contrib/src/main/scala/scala/collection/immutable/SortedMultiSet.scala diff --git a/src/main/scala/scala/collection/mutable/MultiDict.scala b/collection-contrib/src/main/scala/scala/collection/mutable/MultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/mutable/MultiDict.scala rename to collection-contrib/src/main/scala/scala/collection/mutable/MultiDict.scala diff --git a/src/main/scala/scala/collection/mutable/MultiSet.scala b/collection-contrib/src/main/scala/scala/collection/mutable/MultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/mutable/MultiSet.scala rename to collection-contrib/src/main/scala/scala/collection/mutable/MultiSet.scala diff --git a/src/main/scala/scala/collection/mutable/SortedMultiDict.scala b/collection-contrib/src/main/scala/scala/collection/mutable/SortedMultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/mutable/SortedMultiDict.scala rename to collection-contrib/src/main/scala/scala/collection/mutable/SortedMultiDict.scala diff --git a/src/main/scala/scala/collection/mutable/SortedMultiSet.scala b/collection-contrib/src/main/scala/scala/collection/mutable/SortedMultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/mutable/SortedMultiSet.scala rename to collection-contrib/src/main/scala/scala/collection/mutable/SortedMultiSet.scala diff --git a/src/test/scala/scala/collection/MultiDictTest.scala b/collection-contrib/src/test/scala/scala/collection/MultiDictTest.scala similarity index 100% rename from src/test/scala/scala/collection/MultiDictTest.scala rename to collection-contrib/src/test/scala/scala/collection/MultiDictTest.scala diff --git a/src/test/scala/scala/collection/MultiSetTest.scala b/collection-contrib/src/test/scala/scala/collection/MultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/MultiSetTest.scala rename to collection-contrib/src/test/scala/scala/collection/MultiSetTest.scala diff --git a/src/test/scala/scala/collection/SortedMultiMapTest.scala b/collection-contrib/src/test/scala/scala/collection/SortedMultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/SortedMultiMapTest.scala rename to collection-contrib/src/test/scala/scala/collection/SortedMultiMapTest.scala diff --git a/src/test/scala/scala/collection/SortedMultiSetTest.scala b/collection-contrib/src/test/scala/scala/collection/SortedMultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/SortedMultiSetTest.scala rename to collection-contrib/src/test/scala/scala/collection/SortedMultiSetTest.scala diff --git a/src/test/scala/scala/collection/decorators/BitSetDecoratorTest.scala b/collection-contrib/src/test/scala/scala/collection/decorators/BitSetDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/BitSetDecoratorTest.scala rename to collection-contrib/src/test/scala/scala/collection/decorators/BitSetDecoratorTest.scala diff --git a/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala b/collection-contrib/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala rename to collection-contrib/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala diff --git a/src/test/scala/scala/collection/decorators/IteratorDecoratorTest.scala b/collection-contrib/src/test/scala/scala/collection/decorators/IteratorDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/IteratorDecoratorTest.scala rename to collection-contrib/src/test/scala/scala/collection/decorators/IteratorDecoratorTest.scala diff --git a/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala b/collection-contrib/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/MapDecoratorTest.scala rename to collection-contrib/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala diff --git a/src/test/scala/scala/collection/decorators/MutableBitSetDecoratorTest.scala b/collection-contrib/src/test/scala/scala/collection/decorators/MutableBitSetDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/MutableBitSetDecoratorTest.scala rename to collection-contrib/src/test/scala/scala/collection/decorators/MutableBitSetDecoratorTest.scala diff --git a/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala b/collection-contrib/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala rename to collection-contrib/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala diff --git a/src/test/scala/scala/collection/immutable/MultiMapTest.scala b/collection-contrib/src/test/scala/scala/collection/immutable/MultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/immutable/MultiMapTest.scala rename to collection-contrib/src/test/scala/scala/collection/immutable/MultiMapTest.scala diff --git a/src/test/scala/scala/collection/immutable/MultiSetTest.scala b/collection-contrib/src/test/scala/scala/collection/immutable/MultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/immutable/MultiSetTest.scala rename to collection-contrib/src/test/scala/scala/collection/immutable/MultiSetTest.scala diff --git a/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala b/collection-contrib/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala rename to collection-contrib/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala diff --git a/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala b/collection-contrib/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala rename to collection-contrib/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala diff --git a/src/test/scala/scala/collection/mutable/MultiMapTest.scala b/collection-contrib/src/test/scala/scala/collection/mutable/MultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/mutable/MultiMapTest.scala rename to collection-contrib/src/test/scala/scala/collection/mutable/MultiMapTest.scala diff --git a/src/test/scala/scala/collection/mutable/MultiSetTest.scala b/collection-contrib/src/test/scala/scala/collection/mutable/MultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/mutable/MultiSetTest.scala rename to collection-contrib/src/test/scala/scala/collection/mutable/MultiSetTest.scala diff --git a/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala b/collection-contrib/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala rename to collection-contrib/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala diff --git a/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala b/collection-contrib/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala rename to collection-contrib/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala