scala · julienrf · Oct 28, 2019 · Jan 1, 2020
diff --git 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/...in/scala/scala/collection/MultiDict.scala → ...in/scala/scala/collection/MultiDict.scala b/...in/scala/scala/collection/MultiDict.scala → ...in/scala/scala/collection/MultiDict.scala
diff --git a/...ain/scala/scala/collection/MultiSet.scala → ...ain/scala/scala/collection/MultiSet.scala b/...ain/scala/scala/collection/MultiSet.scala → ...ain/scala/scala/collection/MultiSet.scala
diff --git a/...la/scala/collection/SortedMultiDict.scala → ...la/scala/collection/SortedMultiDict.scala b/...la/scala/collection/SortedMultiDict.scala → ...la/scala/collection/SortedMultiDict.scala
diff --git a/...ala/scala/collection/SortedMultiSet.scala → ...ala/scala/collection/SortedMultiSet.scala b/...ala/scala/collection/SortedMultiSet.scala → ...ala/scala/collection/SortedMultiSet.scala
diff --git a/...llection/decorators/BitSetDecorator.scala → ...llection/decorators/BitSetDecorator.scala b/...llection/decorators/BitSetDecorator.scala → ...llection/decorators/BitSetDecorator.scala
diff --git a/...ection/decorators/IterableDecorator.scala → ...ection/decorators/IterableDecorator.scala b/...ection/decorators/IterableDecorator.scala → ...ection/decorators/IterableDecorator.scala
diff --git a/...ection/decorators/IteratorDecorator.scala → ...ection/decorators/IteratorDecorator.scala b/...ection/decorators/IteratorDecorator.scala → ...ection/decorators/IteratorDecorator.scala
diff --git a/.../collection/decorators/MapDecorator.scala → .../collection/decorators/MapDecorator.scala b/.../collection/decorators/MapDecorator.scala → .../collection/decorators/MapDecorator.scala
diff --git a/...n/decorators/MutableBitSetDecorator.scala → ...n/decorators/MutableBitSetDecorator.scala b/...n/decorators/MutableBitSetDecorator.scala → ...n/decorators/MutableBitSetDecorator.scala
diff --git a/.../collection/decorators/SeqDecorator.scala → .../collection/decorators/SeqDecorator.scala b/.../collection/decorators/SeqDecorator.scala → .../collection/decorators/SeqDecorator.scala
diff --git a/...scala/collection/decorators/package.scala → ...scala/collection/decorators/package.scala b/...scala/collection/decorators/package.scala → ...scala/collection/decorators/package.scala
diff --git a/...a/scala/collection/decorators/views.scala → ...a/scala/collection/decorators/views.scala b/...a/scala/collection/decorators/views.scala → ...a/scala/collection/decorators/views.scala
diff --git a/...cala/collection/immutable/MultiDict.scala → ...cala/collection/immutable/MultiDict.scala b/...cala/collection/immutable/MultiDict.scala → ...cala/collection/immutable/MultiDict.scala
diff --git a/...scala/collection/immutable/MultiSet.scala → ...scala/collection/immutable/MultiSet.scala b/...scala/collection/immutable/MultiSet.scala → ...scala/collection/immutable/MultiSet.scala
diff --git a/...ollection/immutable/SortedMultiDict.scala → ...ollection/immutable/SortedMultiDict.scala b/...ollection/immutable/SortedMultiDict.scala → ...ollection/immutable/SortedMultiDict.scala
diff --git a/...collection/immutable/SortedMultiSet.scala → ...collection/immutable/SortedMultiSet.scala b/...collection/immutable/SortedMultiSet.scala → ...collection/immutable/SortedMultiSet.scala
diff --git a/.../scala/collection/mutable/MultiDict.scala → .../scala/collection/mutable/MultiDict.scala b/.../scala/collection/mutable/MultiDict.scala → .../scala/collection/mutable/MultiDict.scala
diff --git a/...a/scala/collection/mutable/MultiSet.scala → ...a/scala/collection/mutable/MultiSet.scala b/...a/scala/collection/mutable/MultiSet.scala → ...a/scala/collection/mutable/MultiSet.scala
diff --git a/.../collection/mutable/SortedMultiDict.scala → .../collection/mutable/SortedMultiDict.scala b/.../collection/mutable/SortedMultiDict.scala → .../collection/mutable/SortedMultiDict.scala
diff --git a/...a/collection/mutable/SortedMultiSet.scala → ...a/collection/mutable/SortedMultiSet.scala b/...a/collection/mutable/SortedMultiSet.scala → ...a/collection/mutable/SortedMultiSet.scala
diff --git a/...cala/scala/collection/MultiDictTest.scala → ...cala/scala/collection/MultiDictTest.scala b/...cala/scala/collection/MultiDictTest.scala → ...cala/scala/collection/MultiDictTest.scala
diff --git a/...scala/scala/collection/MultiSetTest.scala → ...scala/scala/collection/MultiSetTest.scala b/...scala/scala/collection/MultiSetTest.scala → ...scala/scala/collection/MultiSetTest.scala
diff --git a/...scala/collection/SortedMultiMapTest.scala → ...scala/collection/SortedMultiMapTest.scala b/...scala/collection/SortedMultiMapTest.scala → ...scala/collection/SortedMultiMapTest.scala
diff --git a/...scala/collection/SortedMultiSetTest.scala → ...scala/collection/SortedMultiSetTest.scala b/...scala/collection/SortedMultiSetTest.scala → ...scala/collection/SortedMultiSetTest.scala
diff --git a/...tion/decorators/BitSetDecoratorTest.scala → ...tion/decorators/BitSetDecoratorTest.scala b/...tion/decorators/BitSetDecoratorTest.scala → ...tion/decorators/BitSetDecoratorTest.scala
diff --git a/...on/decorators/IterableDecoratorTest.scala → ...on/decorators/IterableDecoratorTest.scala b/...on/decorators/IterableDecoratorTest.scala → ...on/decorators/IterableDecoratorTest.scala
diff --git a/...on/decorators/IteratorDecoratorTest.scala → ...on/decorators/IteratorDecoratorTest.scala b/...on/decorators/IteratorDecoratorTest.scala → ...on/decorators/IteratorDecoratorTest.scala
diff --git a/...lection/decorators/MapDecoratorTest.scala → ...lection/decorators/MapDecoratorTest.scala b/...lection/decorators/MapDecoratorTest.scala → ...lection/decorators/MapDecoratorTest.scala
diff --git a/...corators/MutableBitSetDecoratorTest.scala → ...corators/MutableBitSetDecoratorTest.scala b/...corators/MutableBitSetDecoratorTest.scala → ...corators/MutableBitSetDecoratorTest.scala
diff --git a/...lection/decorators/SeqDecoratorTest.scala → ...lection/decorators/SeqDecoratorTest.scala b/...lection/decorators/SeqDecoratorTest.scala → ...lection/decorators/SeqDecoratorTest.scala
diff --git a/...a/collection/immutable/MultiMapTest.scala → ...a/collection/immutable/MultiMapTest.scala b/...a/collection/immutable/MultiMapTest.scala → ...a/collection/immutable/MultiMapTest.scala
diff --git a/...a/collection/immutable/MultiSetTest.scala → ...a/collection/immutable/MultiSetTest.scala b/...a/collection/immutable/MultiSetTest.scala → ...a/collection/immutable/MultiSetTest.scala
diff --git a/...ection/immutable/SortedMultiMapTest.scala → ...ection/immutable/SortedMultiMapTest.scala b/...ection/immutable/SortedMultiMapTest.scala → ...ection/immutable/SortedMultiMapTest.scala
diff --git a/...ection/immutable/SortedMultiSetTest.scala → ...ection/immutable/SortedMultiSetTest.scala b/...ection/immutable/SortedMultiSetTest.scala → ...ection/immutable/SortedMultiSetTest.scala
diff --git a/...ala/collection/mutable/MultiMapTest.scala → ...ala/collection/mutable/MultiMapTest.scala b/...ala/collection/mutable/MultiMapTest.scala → ...ala/collection/mutable/MultiMapTest.scala
diff --git a/...ala/collection/mutable/MultiSetTest.scala → ...ala/collection/mutable/MultiSetTest.scala b/...ala/collection/mutable/MultiSetTest.scala → ...ala/collection/mutable/MultiSetTest.scala
diff --git a/...llection/mutable/SortedMultiMapTest.scala → ...llection/mutable/SortedMultiMapTest.scala b/...llection/mutable/SortedMultiMapTest.scala → ...llection/mutable/SortedMultiMapTest.scala
diff --git a/...llection/mutable/SortedMultiSetTest.scala → ...llection/mutable/SortedMultiSetTest.scala b/...llection/mutable/SortedMultiSetTest.scala → ...llection/mutable/SortedMultiSetTest.scala