scala
diff --git a/‎build.sbt
Lines changed: 8 additions & 3 deletions b/‎build.sbt
Lines changed: 8 additions & 3 deletions
diff --git a/‎shared/src/main/scala/scala/collection/MultiDict.scala renamed to ‎src/main/scala/scala/collection/MultiDict.scala b/‎shared/src/main/scala/scala/collection/MultiDict.scala renamed to ‎src/main/scala/scala/collection/MultiDict.scala
diff --git a/‎shared/src/main/scala/scala/collection/MultiSet.scala renamed to ‎src/main/scala/scala/collection/MultiSet.scala b/‎shared/src/main/scala/scala/collection/MultiSet.scala renamed to ‎src/main/scala/scala/collection/MultiSet.scala
diff --git a/‎shared/src/main/scala/scala/collection/SortedMultiDict.scala renamed to ‎src/main/scala/scala/collection/SortedMultiDict.scala b/‎shared/src/main/scala/scala/collection/SortedMultiDict.scala renamed to ‎src/main/scala/scala/collection/SortedMultiDict.scala
diff --git a/‎shared/src/main/scala/scala/collection/SortedMultiSet.scala renamed to ‎src/main/scala/scala/collection/SortedMultiSet.scala b/‎shared/src/main/scala/scala/collection/SortedMultiSet.scala renamed to ‎src/main/scala/scala/collection/SortedMultiSet.scala
diff --git a/‎shared/src/main/scala/scala/collection/decorators/IterableDecorator.scala renamed to ‎src/main/scala/scala/collection/decorators/IterableDecorator.scala b/‎shared/src/main/scala/scala/collection/decorators/IterableDecorator.scala renamed to ‎src/main/scala/scala/collection/decorators/IterableDecorator.scala
diff --git a/‎shared/src/main/scala/scala/collection/decorators/IteratorDecorator.scala renamed to ‎src/main/scala/scala/collection/decorators/IteratorDecorator.scala b/‎shared/src/main/scala/scala/collection/decorators/IteratorDecorator.scala renamed to ‎src/main/scala/scala/collection/decorators/IteratorDecorator.scala
diff --git a/‎shared/src/main/scala/scala/collection/decorators/MapDecorator.scala renamed to ‎src/main/scala/scala/collection/decorators/MapDecorator.scala b/‎shared/src/main/scala/scala/collection/decorators/MapDecorator.scala renamed to ‎src/main/scala/scala/collection/decorators/MapDecorator.scala
diff --git a/‎shared/src/main/scala/scala/collection/decorators/SeqDecorator.scala renamed to ‎src/main/scala/scala/collection/decorators/SeqDecorator.scala b/‎shared/src/main/scala/scala/collection/decorators/SeqDecorator.scala renamed to ‎src/main/scala/scala/collection/decorators/SeqDecorator.scala
diff --git a/‎shared/src/main/scala/scala/collection/decorators/package.scala renamed to ‎src/main/scala/scala/collection/decorators/package.scala b/‎shared/src/main/scala/scala/collection/decorators/package.scala renamed to ‎src/main/scala/scala/collection/decorators/package.scala
diff --git a/‎shared/src/main/scala/scala/collection/decorators/views.scala renamed to ‎src/main/scala/scala/collection/decorators/views.scala b/‎shared/src/main/scala/scala/collection/decorators/views.scala renamed to ‎src/main/scala/scala/collection/decorators/views.scala
diff --git a/‎shared/src/main/scala/scala/collection/immutable/MultiDict.scala renamed to ‎src/main/scala/scala/collection/immutable/MultiDict.scala b/‎shared/src/main/scala/scala/collection/immutable/MultiDict.scala renamed to ‎src/main/scala/scala/collection/immutable/MultiDict.scala
diff --git a/‎shared/src/main/scala/scala/collection/immutable/MultiSet.scala renamed to ‎src/main/scala/scala/collection/immutable/MultiSet.scala b/‎shared/src/main/scala/scala/collection/immutable/MultiSet.scala renamed to ‎src/main/scala/scala/collection/immutable/MultiSet.scala
diff --git a/‎shared/src/main/scala/scala/collection/immutable/SortedMultiDict.scala renamed to ‎src/main/scala/scala/collection/immutable/SortedMultiDict.scala b/‎shared/src/main/scala/scala/collection/immutable/SortedMultiDict.scala renamed to ‎src/main/scala/scala/collection/immutable/SortedMultiDict.scala
diff --git a/‎shared/src/main/scala/scala/collection/immutable/SortedMultiSet.scala renamed to ‎src/main/scala/scala/collection/immutable/SortedMultiSet.scala b/‎shared/src/main/scala/scala/collection/immutable/SortedMultiSet.scala renamed to ‎src/main/scala/scala/collection/immutable/SortedMultiSet.scala
diff --git a/‎shared/src/main/scala/scala/collection/mutable/MultiDict.scala renamed to ‎src/main/scala/scala/collection/mutable/MultiDict.scala b/‎shared/src/main/scala/scala/collection/mutable/MultiDict.scala renamed to ‎src/main/scala/scala/collection/mutable/MultiDict.scala
diff --git a/‎shared/src/main/scala/scala/collection/mutable/MultiSet.scala renamed to ‎src/main/scala/scala/collection/mutable/MultiSet.scala b/‎shared/src/main/scala/scala/collection/mutable/MultiSet.scala renamed to ‎src/main/scala/scala/collection/mutable/MultiSet.scala
diff --git a/‎shared/src/main/scala/scala/collection/mutable/SortedMultiDict.scala renamed to ‎src/main/scala/scala/collection/mutable/SortedMultiDict.scala b/‎shared/src/main/scala/scala/collection/mutable/SortedMultiDict.scala renamed to ‎src/main/scala/scala/collection/mutable/SortedMultiDict.scala
diff --git a/‎shared/src/main/scala/scala/collection/mutable/SortedMultiSet.scala renamed to ‎src/main/scala/scala/collection/mutable/SortedMultiSet.scala b/‎shared/src/main/scala/scala/collection/mutable/SortedMultiSet.scala renamed to ‎src/main/scala/scala/collection/mutable/SortedMultiSet.scala
diff --git a/‎shared/src/test/scala/scala/collection/MultiDictTest.scala renamed to ‎src/test/scala/scala/collection/MultiDictTest.scala b/‎shared/src/test/scala/scala/collection/MultiDictTest.scala renamed to ‎src/test/scala/scala/collection/MultiDictTest.scala
diff --git a/‎shared/src/test/scala/scala/collection/MultiSetTest.scala renamed to ‎src/test/scala/scala/collection/MultiSetTest.scala b/‎shared/src/test/scala/scala/collection/MultiSetTest.scala renamed to ‎src/test/scala/scala/collection/MultiSetTest.scala
diff --git a/‎shared/src/test/scala/scala/collection/SortedMultiMapTest.scala renamed to ‎src/test/scala/scala/collection/SortedMultiMapTest.scala b/‎shared/src/test/scala/scala/collection/SortedMultiMapTest.scala renamed to ‎src/test/scala/scala/collection/SortedMultiMapTest.scala
diff --git a/‎shared/src/test/scala/scala/collection/SortedMultiSetTest.scala renamed to ‎src/test/scala/scala/collection/SortedMultiSetTest.scala b/‎shared/src/test/scala/scala/collection/SortedMultiSetTest.scala renamed to ‎src/test/scala/scala/collection/SortedMultiSetTest.scala
diff --git a/‎shared/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala renamed to ‎src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala b/‎shared/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala renamed to ‎src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala
diff --git a/‎shared/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala renamed to ‎src/test/scala/scala/collection/decorators/MapDecoratorTest.scala b/‎shared/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala renamed to ‎src/test/scala/scala/collection/decorators/MapDecoratorTest.scala
diff --git a/‎shared/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala renamed to ‎src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala b/‎shared/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala renamed to ‎src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala
diff --git a/‎shared/src/test/scala/scala/collection/immutable/MultiMapTest.scala renamed to ‎src/test/scala/scala/collection/immutable/MultiMapTest.scala b/‎shared/src/test/scala/scala/collection/immutable/MultiMapTest.scala renamed to ‎src/test/scala/scala/collection/immutable/MultiMapTest.scala
diff --git a/‎shared/src/test/scala/scala/collection/immutable/MultiSetTest.scala renamed to ‎src/test/scala/scala/collection/immutable/MultiSetTest.scala b/‎shared/src/test/scala/scala/collection/immutable/MultiSetTest.scala renamed to ‎src/test/scala/scala/collection/immutable/MultiSetTest.scala
diff --git a/‎shared/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala renamed to ‎src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala b/‎shared/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala renamed to ‎src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala
diff --git a/‎shared/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala renamed to ‎src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala b/‎shared/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala renamed to ‎src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala
diff --git a/‎shared/src/test/scala/scala/collection/mutable/MultiMapTest.scala renamed to ‎src/test/scala/scala/collection/mutable/MultiMapTest.scala b/‎shared/src/test/scala/scala/collection/mutable/MultiMapTest.scala renamed to ‎src/test/scala/scala/collection/mutable/MultiMapTest.scala
diff --git a/‎shared/src/test/scala/scala/collection/mutable/MultiSetTest.scala renamed to ‎src/test/scala/scala/collection/mutable/MultiSetTest.scala b/‎shared/src/test/scala/scala/collection/mutable/MultiSetTest.scala renamed to ‎src/test/scala/scala/collection/mutable/MultiSetTest.scala
diff --git a/‎shared/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala renamed to ‎src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala b/‎shared/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala renamed to ‎src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala
diff --git a/‎shared/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala renamed to ‎src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala b/‎shared/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala renamed to ‎src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala
@@ -3,11 +3,16 @@ import ScalaModulePlugin._
 
 lazy val root = project.in(file("."))
   .aggregate(`scala-collection-contribJS`, `scala-collection-contribJVM`)
-  .settings(disablePublishing)
+  .settings(
+    disablePublishing,
+    // HACK If we don’t add this dependency the tests compilation of the aggregated projects fails
+    libraryDependencies += "junit" % "junit" % "4.12" % Test
+  )
 
-lazy val `scala-collection-contrib`  = crossProject(JVMPlatform, JSPlatform)
+lazy val `scala-collection-contrib` = crossProject(JVMPlatform, JSPlatform)
+  .crossType(CrossType.Pure)
   .withoutSuffixFor(JVMPlatform).in(file("."))
-  .settings(scalaModuleSettings: _*)
+  .settings(scalaModuleSettings)
   .jvmSettings(scalaModuleSettingsJVM)
   .settings(
     name := "scala-collection-contrib",