Merge pull request #1 from julienrf/scalajs

Use CrossType.Pure
scala · Jul 29, 2019 · 68b9918 · 68b9918
2 parents f200629 + cacb729
commit 68b9918
Show file tree

Hide file tree

Showing 34 changed files with 8 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -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",

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/...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/.../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/...on/decorators/IterableDecoratorTest.scala → ...on/decorators/IterableDecoratorTest.scala b/...on/decorators/IterableDecoratorTest.scala → ...on/decorators/IterableDecoratorTest.scala
diff --git a/...lection/decorators/MapDecoratorTest.scala → ...lection/decorators/MapDecoratorTest.scala b/...lection/decorators/MapDecoratorTest.scala → ...lection/decorators/MapDecoratorTest.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