From f200629c7b92ce062221ddb231b0bc2a6f72ed21 Mon Sep 17 00:00:00 2001 From: exoego Date: Wed, 24 Jul 2019 12:01:16 +0900 Subject: [PATCH 1/2] Add Scala.js cross build --- .travis.yml | 7 +- build.sbt | 65 ++++++++++++------- project/plugins.sbt | 4 ++ .../scala/scala/collection/MultiDict.scala | 0 .../scala/scala/collection/MultiSet.scala | 0 .../scala/collection/SortedMultiDict.scala | 0 .../scala/collection/SortedMultiSet.scala | 0 .../decorators/IterableDecorator.scala | 0 .../decorators/IteratorDecorator.scala | 0 .../collection/decorators/MapDecorator.scala | 0 .../collection/decorators/SeqDecorator.scala | 0 .../scala/collection/decorators/package.scala | 0 .../scala/collection/decorators/views.scala | 0 .../collection/immutable/MultiDict.scala | 0 .../scala/collection/immutable/MultiSet.scala | 0 .../immutable/SortedMultiDict.scala | 0 .../collection/immutable/SortedMultiSet.scala | 0 .../scala/collection/mutable/MultiDict.scala | 0 .../scala/collection/mutable/MultiSet.scala | 0 .../collection/mutable/SortedMultiDict.scala | 0 .../collection/mutable/SortedMultiSet.scala | 0 .../scala/collection/MultiDictTest.scala | 0 .../scala/scala/collection/MultiSetTest.scala | 0 .../scala/collection/SortedMultiMapTest.scala | 0 .../scala/collection/SortedMultiSetTest.scala | 0 .../decorators/IterableDecoratorTest.scala | 0 .../decorators/MapDecoratorTest.scala | 0 .../decorators/SeqDecoratorTest.scala | 0 .../collection/immutable/MultiMapTest.scala | 0 .../collection/immutable/MultiSetTest.scala | 0 .../immutable/SortedMultiMapTest.scala | 0 .../immutable/SortedMultiSetTest.scala | 0 .../collection/mutable/MultiMapTest.scala | 0 .../collection/mutable/MultiSetTest.scala | 0 .../mutable/SortedMultiMapTest.scala | 0 .../mutable/SortedMultiSetTest.scala | 0 36 files changed, 50 insertions(+), 26 deletions(-) rename {src => shared/src}/main/scala/scala/collection/MultiDict.scala (100%) rename {src => shared/src}/main/scala/scala/collection/MultiSet.scala (100%) rename {src => shared/src}/main/scala/scala/collection/SortedMultiDict.scala (100%) rename {src => shared/src}/main/scala/scala/collection/SortedMultiSet.scala (100%) rename {src => shared/src}/main/scala/scala/collection/decorators/IterableDecorator.scala (100%) rename {src => shared/src}/main/scala/scala/collection/decorators/IteratorDecorator.scala (100%) rename {src => shared/src}/main/scala/scala/collection/decorators/MapDecorator.scala (100%) rename {src => shared/src}/main/scala/scala/collection/decorators/SeqDecorator.scala (100%) rename {src => shared/src}/main/scala/scala/collection/decorators/package.scala (100%) rename {src => shared/src}/main/scala/scala/collection/decorators/views.scala (100%) rename {src => shared/src}/main/scala/scala/collection/immutable/MultiDict.scala (100%) rename {src => shared/src}/main/scala/scala/collection/immutable/MultiSet.scala (100%) rename {src => shared/src}/main/scala/scala/collection/immutable/SortedMultiDict.scala (100%) rename {src => shared/src}/main/scala/scala/collection/immutable/SortedMultiSet.scala (100%) rename {src => shared/src}/main/scala/scala/collection/mutable/MultiDict.scala (100%) rename {src => shared/src}/main/scala/scala/collection/mutable/MultiSet.scala (100%) rename {src => shared/src}/main/scala/scala/collection/mutable/SortedMultiDict.scala (100%) rename {src => shared/src}/main/scala/scala/collection/mutable/SortedMultiSet.scala (100%) rename {src => shared/src}/test/scala/scala/collection/MultiDictTest.scala (100%) rename {src => shared/src}/test/scala/scala/collection/MultiSetTest.scala (100%) rename {src => shared/src}/test/scala/scala/collection/SortedMultiMapTest.scala (100%) rename {src => shared/src}/test/scala/scala/collection/SortedMultiSetTest.scala (100%) rename {src => shared/src}/test/scala/scala/collection/decorators/IterableDecoratorTest.scala (100%) rename {src => shared/src}/test/scala/scala/collection/decorators/MapDecoratorTest.scala (100%) rename {src => shared/src}/test/scala/scala/collection/decorators/SeqDecoratorTest.scala (100%) rename {src => shared/src}/test/scala/scala/collection/immutable/MultiMapTest.scala (100%) rename {src => shared/src}/test/scala/scala/collection/immutable/MultiSetTest.scala (100%) rename {src => shared/src}/test/scala/scala/collection/immutable/SortedMultiMapTest.scala (100%) rename {src => shared/src}/test/scala/scala/collection/immutable/SortedMultiSetTest.scala (100%) rename {src => shared/src}/test/scala/scala/collection/mutable/MultiMapTest.scala (100%) rename {src => shared/src}/test/scala/scala/collection/mutable/MultiSetTest.scala (100%) rename {src => shared/src}/test/scala/scala/collection/mutable/SortedMultiMapTest.scala (100%) rename {src => shared/src}/test/scala/scala/collection/mutable/SortedMultiSetTest.scala (100%) diff --git a/.travis.yml b/.travis.yml index b29ad36..a263e94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,11 @@ env: # SONA_PASS - secure: "ggXFZBlzV5ek/rBaE9lrEZlAIfUrv4XDJ4OrP8daMrJxmwkXtoSbcB3z4VgqqWKzAzW89CcU1IiojzDbe/het3xEX4qxdz5Wt05/E+WOgbek528kelwMxq12XRe6xaCVfG+y8OISPgq1q3vKoO/xYGVbK3D6hSD+cjojEXyPpjAfrVSUof06aNPFPQeLX9exgu9zrxkJJm01PbTh19vQk4Ojc++oEmpF7HLD1CF1m7AlW0U2Rba+syivpj9Ray3Z9vu0TnFL06r4TiwZruwcXTLrWUqumFI0r5mhaY6SNH7bqttu+3RPIOdkUGxIeGlkDi3xopt7r2aEkhOKvjRXapW0e/CWmUo1J+NnlIumxrldi4n0iiJGVEvY4Krx/HGZe0wCVTh4vDNOllTGdFmkkxN6WoaHALgj3QNM3XLjvvUu3VcT+QNtsVIvgUDesrtos8zCKczzdhL/d4BMiIg7SFfA33S3vx8BeczLBqddrx+yLSPzfheKrHW7g76EAEyN26vE2/2/GRlMOlG8Lmu8rXBfIPsK9T/ztfE1CxaTW5EsMSrxO2+O/bvAa6DY0R79KkHf7LDI+azzP2NwYx8anM9WlMTp4EbawI/KGZRilWYtJ3Q3y5EQERsrP71W35dKqiBFMPdspS+lTS9hGtso08n7cR2MwTbRjoXVRcWfJ/I=" matrix: - - ADOPTOPENJDK=8 - - ADOPTOPENJDK=11 + # The empty SCALAJS_VERSION will only compile for the JVM + - SCALAJS_VERSION= ADOPTOPENJDK=8 + - SCALAJS_VERSION=0.6.28 ADOPTOPENJDK=8 + - SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8 + - SCALAJS_VERSION= ADOPTOPENJDK=11 before_install: # adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation diff --git a/build.sbt b/build.sbt index a7c6449..c1e3ad9 100644 --- a/build.sbt +++ b/build.sbt @@ -1,26 +1,43 @@ +import sbtcrossproject.CrossPlugin.autoImport.{ crossProject, CrossType } import ScalaModulePlugin._ -scalaModuleSettings -scalaModuleSettingsJVM - -name := "scala-collection-contrib" -version := "0.1.1-SNAPSHOT" - -crossScalaVersions in ThisBuild := Seq("2.13.0") - -scalacOptions ++= Seq("-opt-warnings", "-language:higherKinds", "-deprecation", "-feature", "-Xfatal-warnings") -scalacOptions in (Compile, doc) ++= Seq("-implicits", "-groups") - -testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a") -parallelExecution in Test := false // why? - -mimaPreviousVersion := Some("0.1.0") - -homepage := Some(url("https://github.com/scala/scala-collection-contrib")) -licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0")) - -libraryDependencies ++= Seq( - "junit" % "junit" % "4.12" % Test, - "com.novocode" % "junit-interface" % "0.11" % Test, - "org.openjdk.jol" % "jol-core" % "0.9" % Test -) +lazy val root = project.in(file(".")) + .aggregate(`scala-collection-contribJS`, `scala-collection-contribJVM`) + .settings(disablePublishing) + +lazy val `scala-collection-contrib` = crossProject(JVMPlatform, JSPlatform) + .withoutSuffixFor(JVMPlatform).in(file(".")) + .settings(scalaModuleSettings: _*) + .jvmSettings(scalaModuleSettingsJVM) + .settings( + name := "scala-collection-contrib", + version := "0.1.1-SNAPSHOT", + + crossScalaVersions in ThisBuild := Seq("2.13.0"), + + scalacOptions ++= Seq("-opt-warnings", "-language:higherKinds", "-deprecation", "-feature", "-Xfatal-warnings"), + scalacOptions in (Compile, doc) ++= Seq("-implicits", "-groups"), + + testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a"), + parallelExecution in Test := false, // why? + + mimaPreviousVersion := Some("0.1.0"), + + homepage := Some(url("https://github.com/scala/scala-collection-contrib")), + licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0")), + + libraryDependencies ++= Seq( + "junit" % "junit" % "4.12" % Test, + "com.novocode" % "junit-interface" % "0.11" % Test, + "org.openjdk.jol" % "jol-core" % "0.9" % Test + ) + ) + .jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin)) + .jsSettings( + mimaPreviousVersion := None, + // Scala.js cannot run forked tests + fork in Test := false + ) + +lazy val `scala-collection-contribJVM` = `scala-collection-contrib`.jvm +lazy val `scala-collection-contribJS` = `scala-collection-contrib`.js diff --git a/project/plugins.sbt b/project/plugins.sbt index 2c32f62..0459ceb 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,7 @@ scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings") +val scalajsVersion = Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.28") + addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalajsVersion) +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1") diff --git a/src/main/scala/scala/collection/MultiDict.scala b/shared/src/main/scala/scala/collection/MultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/MultiDict.scala rename to shared/src/main/scala/scala/collection/MultiDict.scala diff --git a/src/main/scala/scala/collection/MultiSet.scala b/shared/src/main/scala/scala/collection/MultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/MultiSet.scala rename to shared/src/main/scala/scala/collection/MultiSet.scala diff --git a/src/main/scala/scala/collection/SortedMultiDict.scala b/shared/src/main/scala/scala/collection/SortedMultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/SortedMultiDict.scala rename to shared/src/main/scala/scala/collection/SortedMultiDict.scala diff --git a/src/main/scala/scala/collection/SortedMultiSet.scala b/shared/src/main/scala/scala/collection/SortedMultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/SortedMultiSet.scala rename to shared/src/main/scala/scala/collection/SortedMultiSet.scala diff --git a/src/main/scala/scala/collection/decorators/IterableDecorator.scala b/shared/src/main/scala/scala/collection/decorators/IterableDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/IterableDecorator.scala rename to shared/src/main/scala/scala/collection/decorators/IterableDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/IteratorDecorator.scala b/shared/src/main/scala/scala/collection/decorators/IteratorDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/IteratorDecorator.scala rename to shared/src/main/scala/scala/collection/decorators/IteratorDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/MapDecorator.scala b/shared/src/main/scala/scala/collection/decorators/MapDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/MapDecorator.scala rename to shared/src/main/scala/scala/collection/decorators/MapDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/SeqDecorator.scala b/shared/src/main/scala/scala/collection/decorators/SeqDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/SeqDecorator.scala rename to shared/src/main/scala/scala/collection/decorators/SeqDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/package.scala b/shared/src/main/scala/scala/collection/decorators/package.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/package.scala rename to shared/src/main/scala/scala/collection/decorators/package.scala diff --git a/src/main/scala/scala/collection/decorators/views.scala b/shared/src/main/scala/scala/collection/decorators/views.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/views.scala rename to shared/src/main/scala/scala/collection/decorators/views.scala diff --git a/src/main/scala/scala/collection/immutable/MultiDict.scala b/shared/src/main/scala/scala/collection/immutable/MultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/immutable/MultiDict.scala rename to shared/src/main/scala/scala/collection/immutable/MultiDict.scala diff --git a/src/main/scala/scala/collection/immutable/MultiSet.scala b/shared/src/main/scala/scala/collection/immutable/MultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/immutable/MultiSet.scala rename to shared/src/main/scala/scala/collection/immutable/MultiSet.scala diff --git a/src/main/scala/scala/collection/immutable/SortedMultiDict.scala b/shared/src/main/scala/scala/collection/immutable/SortedMultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/immutable/SortedMultiDict.scala rename to shared/src/main/scala/scala/collection/immutable/SortedMultiDict.scala diff --git a/src/main/scala/scala/collection/immutable/SortedMultiSet.scala b/shared/src/main/scala/scala/collection/immutable/SortedMultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/immutable/SortedMultiSet.scala rename to shared/src/main/scala/scala/collection/immutable/SortedMultiSet.scala diff --git a/src/main/scala/scala/collection/mutable/MultiDict.scala b/shared/src/main/scala/scala/collection/mutable/MultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/mutable/MultiDict.scala rename to shared/src/main/scala/scala/collection/mutable/MultiDict.scala diff --git a/src/main/scala/scala/collection/mutable/MultiSet.scala b/shared/src/main/scala/scala/collection/mutable/MultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/mutable/MultiSet.scala rename to shared/src/main/scala/scala/collection/mutable/MultiSet.scala diff --git a/src/main/scala/scala/collection/mutable/SortedMultiDict.scala b/shared/src/main/scala/scala/collection/mutable/SortedMultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/mutable/SortedMultiDict.scala rename to shared/src/main/scala/scala/collection/mutable/SortedMultiDict.scala diff --git a/src/main/scala/scala/collection/mutable/SortedMultiSet.scala b/shared/src/main/scala/scala/collection/mutable/SortedMultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/mutable/SortedMultiSet.scala rename to shared/src/main/scala/scala/collection/mutable/SortedMultiSet.scala diff --git a/src/test/scala/scala/collection/MultiDictTest.scala b/shared/src/test/scala/scala/collection/MultiDictTest.scala similarity index 100% rename from src/test/scala/scala/collection/MultiDictTest.scala rename to shared/src/test/scala/scala/collection/MultiDictTest.scala diff --git a/src/test/scala/scala/collection/MultiSetTest.scala b/shared/src/test/scala/scala/collection/MultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/MultiSetTest.scala rename to shared/src/test/scala/scala/collection/MultiSetTest.scala diff --git a/src/test/scala/scala/collection/SortedMultiMapTest.scala b/shared/src/test/scala/scala/collection/SortedMultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/SortedMultiMapTest.scala rename to shared/src/test/scala/scala/collection/SortedMultiMapTest.scala diff --git a/src/test/scala/scala/collection/SortedMultiSetTest.scala b/shared/src/test/scala/scala/collection/SortedMultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/SortedMultiSetTest.scala rename to shared/src/test/scala/scala/collection/SortedMultiSetTest.scala diff --git a/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala b/shared/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala rename to shared/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala diff --git a/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala b/shared/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/MapDecoratorTest.scala rename to shared/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala diff --git a/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala b/shared/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala rename to shared/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala diff --git a/src/test/scala/scala/collection/immutable/MultiMapTest.scala b/shared/src/test/scala/scala/collection/immutable/MultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/immutable/MultiMapTest.scala rename to shared/src/test/scala/scala/collection/immutable/MultiMapTest.scala diff --git a/src/test/scala/scala/collection/immutable/MultiSetTest.scala b/shared/src/test/scala/scala/collection/immutable/MultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/immutable/MultiSetTest.scala rename to shared/src/test/scala/scala/collection/immutable/MultiSetTest.scala diff --git a/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala b/shared/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala rename to shared/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala diff --git a/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala b/shared/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala rename to shared/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala diff --git a/src/test/scala/scala/collection/mutable/MultiMapTest.scala b/shared/src/test/scala/scala/collection/mutable/MultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/mutable/MultiMapTest.scala rename to shared/src/test/scala/scala/collection/mutable/MultiMapTest.scala diff --git a/src/test/scala/scala/collection/mutable/MultiSetTest.scala b/shared/src/test/scala/scala/collection/mutable/MultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/mutable/MultiSetTest.scala rename to shared/src/test/scala/scala/collection/mutable/MultiSetTest.scala diff --git a/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala b/shared/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala rename to shared/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala diff --git a/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala b/shared/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala rename to shared/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala From cacb729c9ff390db25b7e7b5a57a15530879052b Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Mon, 29 Jul 2019 11:22:58 +0200 Subject: [PATCH 2/2] Use CrossType.Pure I had to add a dependency on JUnit to the root project, otherwise the aggregated projects failed compiling. --- build.sbt | 11 ++++++++--- .../main/scala/scala/collection/MultiDict.scala | 0 .../main/scala/scala/collection/MultiSet.scala | 0 .../main/scala/scala/collection/SortedMultiDict.scala | 0 .../main/scala/scala/collection/SortedMultiSet.scala | 0 .../collection/decorators/IterableDecorator.scala | 0 .../collection/decorators/IteratorDecorator.scala | 0 .../scala/collection/decorators/MapDecorator.scala | 0 .../scala/collection/decorators/SeqDecorator.scala | 0 .../scala/scala/collection/decorators/package.scala | 0 .../scala/scala/collection/decorators/views.scala | 0 .../scala/scala/collection/immutable/MultiDict.scala | 0 .../scala/scala/collection/immutable/MultiSet.scala | 0 .../scala/collection/immutable/SortedMultiDict.scala | 0 .../scala/collection/immutable/SortedMultiSet.scala | 0 .../scala/scala/collection/mutable/MultiDict.scala | 0 .../scala/scala/collection/mutable/MultiSet.scala | 0 .../scala/collection/mutable/SortedMultiDict.scala | 0 .../scala/collection/mutable/SortedMultiSet.scala | 0 .../test/scala/scala/collection/MultiDictTest.scala | 0 .../test/scala/scala/collection/MultiSetTest.scala | 0 .../scala/scala/collection/SortedMultiMapTest.scala | 0 .../scala/scala/collection/SortedMultiSetTest.scala | 0 .../collection/decorators/IterableDecoratorTest.scala | 0 .../collection/decorators/MapDecoratorTest.scala | 0 .../collection/decorators/SeqDecoratorTest.scala | 0 .../scala/collection/immutable/MultiMapTest.scala | 0 .../scala/collection/immutable/MultiSetTest.scala | 0 .../collection/immutable/SortedMultiMapTest.scala | 0 .../collection/immutable/SortedMultiSetTest.scala | 0 .../scala/scala/collection/mutable/MultiMapTest.scala | 0 .../scala/scala/collection/mutable/MultiSetTest.scala | 0 .../scala/collection/mutable/SortedMultiMapTest.scala | 0 .../scala/collection/mutable/SortedMultiSetTest.scala | 0 34 files changed, 8 insertions(+), 3 deletions(-) rename {shared/src => src}/main/scala/scala/collection/MultiDict.scala (100%) rename {shared/src => src}/main/scala/scala/collection/MultiSet.scala (100%) rename {shared/src => src}/main/scala/scala/collection/SortedMultiDict.scala (100%) rename {shared/src => src}/main/scala/scala/collection/SortedMultiSet.scala (100%) rename {shared/src => src}/main/scala/scala/collection/decorators/IterableDecorator.scala (100%) rename {shared/src => src}/main/scala/scala/collection/decorators/IteratorDecorator.scala (100%) rename {shared/src => src}/main/scala/scala/collection/decorators/MapDecorator.scala (100%) rename {shared/src => src}/main/scala/scala/collection/decorators/SeqDecorator.scala (100%) rename {shared/src => src}/main/scala/scala/collection/decorators/package.scala (100%) rename {shared/src => src}/main/scala/scala/collection/decorators/views.scala (100%) rename {shared/src => src}/main/scala/scala/collection/immutable/MultiDict.scala (100%) rename {shared/src => src}/main/scala/scala/collection/immutable/MultiSet.scala (100%) rename {shared/src => src}/main/scala/scala/collection/immutable/SortedMultiDict.scala (100%) rename {shared/src => src}/main/scala/scala/collection/immutable/SortedMultiSet.scala (100%) rename {shared/src => src}/main/scala/scala/collection/mutable/MultiDict.scala (100%) rename {shared/src => src}/main/scala/scala/collection/mutable/MultiSet.scala (100%) rename {shared/src => src}/main/scala/scala/collection/mutable/SortedMultiDict.scala (100%) rename {shared/src => src}/main/scala/scala/collection/mutable/SortedMultiSet.scala (100%) rename {shared/src => src}/test/scala/scala/collection/MultiDictTest.scala (100%) rename {shared/src => src}/test/scala/scala/collection/MultiSetTest.scala (100%) rename {shared/src => src}/test/scala/scala/collection/SortedMultiMapTest.scala (100%) rename {shared/src => src}/test/scala/scala/collection/SortedMultiSetTest.scala (100%) rename {shared/src => src}/test/scala/scala/collection/decorators/IterableDecoratorTest.scala (100%) rename {shared/src => src}/test/scala/scala/collection/decorators/MapDecoratorTest.scala (100%) rename {shared/src => src}/test/scala/scala/collection/decorators/SeqDecoratorTest.scala (100%) rename {shared/src => src}/test/scala/scala/collection/immutable/MultiMapTest.scala (100%) rename {shared/src => src}/test/scala/scala/collection/immutable/MultiSetTest.scala (100%) rename {shared/src => src}/test/scala/scala/collection/immutable/SortedMultiMapTest.scala (100%) rename {shared/src => src}/test/scala/scala/collection/immutable/SortedMultiSetTest.scala (100%) rename {shared/src => src}/test/scala/scala/collection/mutable/MultiMapTest.scala (100%) rename {shared/src => src}/test/scala/scala/collection/mutable/MultiSetTest.scala (100%) rename {shared/src => src}/test/scala/scala/collection/mutable/SortedMultiMapTest.scala (100%) rename {shared/src => src}/test/scala/scala/collection/mutable/SortedMultiSetTest.scala (100%) diff --git a/build.sbt b/build.sbt index c1e3ad9..4a5c909 100644 --- 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/shared/src/main/scala/scala/collection/MultiDict.scala b/src/main/scala/scala/collection/MultiDict.scala similarity index 100% rename from shared/src/main/scala/scala/collection/MultiDict.scala rename to src/main/scala/scala/collection/MultiDict.scala diff --git a/shared/src/main/scala/scala/collection/MultiSet.scala b/src/main/scala/scala/collection/MultiSet.scala similarity index 100% rename from shared/src/main/scala/scala/collection/MultiSet.scala rename to src/main/scala/scala/collection/MultiSet.scala diff --git a/shared/src/main/scala/scala/collection/SortedMultiDict.scala b/src/main/scala/scala/collection/SortedMultiDict.scala similarity index 100% rename from shared/src/main/scala/scala/collection/SortedMultiDict.scala rename to src/main/scala/scala/collection/SortedMultiDict.scala diff --git a/shared/src/main/scala/scala/collection/SortedMultiSet.scala b/src/main/scala/scala/collection/SortedMultiSet.scala similarity index 100% rename from shared/src/main/scala/scala/collection/SortedMultiSet.scala rename to src/main/scala/scala/collection/SortedMultiSet.scala diff --git a/shared/src/main/scala/scala/collection/decorators/IterableDecorator.scala b/src/main/scala/scala/collection/decorators/IterableDecorator.scala similarity index 100% rename from shared/src/main/scala/scala/collection/decorators/IterableDecorator.scala rename to src/main/scala/scala/collection/decorators/IterableDecorator.scala diff --git a/shared/src/main/scala/scala/collection/decorators/IteratorDecorator.scala b/src/main/scala/scala/collection/decorators/IteratorDecorator.scala similarity index 100% rename from shared/src/main/scala/scala/collection/decorators/IteratorDecorator.scala rename to src/main/scala/scala/collection/decorators/IteratorDecorator.scala diff --git a/shared/src/main/scala/scala/collection/decorators/MapDecorator.scala b/src/main/scala/scala/collection/decorators/MapDecorator.scala similarity index 100% rename from shared/src/main/scala/scala/collection/decorators/MapDecorator.scala rename to src/main/scala/scala/collection/decorators/MapDecorator.scala diff --git a/shared/src/main/scala/scala/collection/decorators/SeqDecorator.scala b/src/main/scala/scala/collection/decorators/SeqDecorator.scala similarity index 100% rename from shared/src/main/scala/scala/collection/decorators/SeqDecorator.scala rename to src/main/scala/scala/collection/decorators/SeqDecorator.scala diff --git a/shared/src/main/scala/scala/collection/decorators/package.scala b/src/main/scala/scala/collection/decorators/package.scala similarity index 100% rename from shared/src/main/scala/scala/collection/decorators/package.scala rename to src/main/scala/scala/collection/decorators/package.scala diff --git a/shared/src/main/scala/scala/collection/decorators/views.scala b/src/main/scala/scala/collection/decorators/views.scala similarity index 100% rename from shared/src/main/scala/scala/collection/decorators/views.scala rename to src/main/scala/scala/collection/decorators/views.scala diff --git a/shared/src/main/scala/scala/collection/immutable/MultiDict.scala b/src/main/scala/scala/collection/immutable/MultiDict.scala similarity index 100% rename from shared/src/main/scala/scala/collection/immutable/MultiDict.scala rename to src/main/scala/scala/collection/immutable/MultiDict.scala diff --git a/shared/src/main/scala/scala/collection/immutable/MultiSet.scala b/src/main/scala/scala/collection/immutable/MultiSet.scala similarity index 100% rename from shared/src/main/scala/scala/collection/immutable/MultiSet.scala rename to src/main/scala/scala/collection/immutable/MultiSet.scala diff --git a/shared/src/main/scala/scala/collection/immutable/SortedMultiDict.scala b/src/main/scala/scala/collection/immutable/SortedMultiDict.scala similarity index 100% rename from shared/src/main/scala/scala/collection/immutable/SortedMultiDict.scala rename to src/main/scala/scala/collection/immutable/SortedMultiDict.scala diff --git a/shared/src/main/scala/scala/collection/immutable/SortedMultiSet.scala b/src/main/scala/scala/collection/immutable/SortedMultiSet.scala similarity index 100% rename from shared/src/main/scala/scala/collection/immutable/SortedMultiSet.scala rename to src/main/scala/scala/collection/immutable/SortedMultiSet.scala diff --git a/shared/src/main/scala/scala/collection/mutable/MultiDict.scala b/src/main/scala/scala/collection/mutable/MultiDict.scala similarity index 100% rename from shared/src/main/scala/scala/collection/mutable/MultiDict.scala rename to src/main/scala/scala/collection/mutable/MultiDict.scala diff --git a/shared/src/main/scala/scala/collection/mutable/MultiSet.scala b/src/main/scala/scala/collection/mutable/MultiSet.scala similarity index 100% rename from shared/src/main/scala/scala/collection/mutable/MultiSet.scala rename to src/main/scala/scala/collection/mutable/MultiSet.scala diff --git a/shared/src/main/scala/scala/collection/mutable/SortedMultiDict.scala b/src/main/scala/scala/collection/mutable/SortedMultiDict.scala similarity index 100% rename from shared/src/main/scala/scala/collection/mutable/SortedMultiDict.scala rename to src/main/scala/scala/collection/mutable/SortedMultiDict.scala diff --git a/shared/src/main/scala/scala/collection/mutable/SortedMultiSet.scala b/src/main/scala/scala/collection/mutable/SortedMultiSet.scala similarity index 100% rename from shared/src/main/scala/scala/collection/mutable/SortedMultiSet.scala rename to src/main/scala/scala/collection/mutable/SortedMultiSet.scala diff --git a/shared/src/test/scala/scala/collection/MultiDictTest.scala b/src/test/scala/scala/collection/MultiDictTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/MultiDictTest.scala rename to src/test/scala/scala/collection/MultiDictTest.scala diff --git a/shared/src/test/scala/scala/collection/MultiSetTest.scala b/src/test/scala/scala/collection/MultiSetTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/MultiSetTest.scala rename to src/test/scala/scala/collection/MultiSetTest.scala diff --git a/shared/src/test/scala/scala/collection/SortedMultiMapTest.scala b/src/test/scala/scala/collection/SortedMultiMapTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/SortedMultiMapTest.scala rename to src/test/scala/scala/collection/SortedMultiMapTest.scala diff --git a/shared/src/test/scala/scala/collection/SortedMultiSetTest.scala b/src/test/scala/scala/collection/SortedMultiSetTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/SortedMultiSetTest.scala rename to src/test/scala/scala/collection/SortedMultiSetTest.scala diff --git a/shared/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala b/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala rename to src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala diff --git a/shared/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala b/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala rename to src/test/scala/scala/collection/decorators/MapDecoratorTest.scala diff --git a/shared/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala b/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala rename to src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala diff --git a/shared/src/test/scala/scala/collection/immutable/MultiMapTest.scala b/src/test/scala/scala/collection/immutable/MultiMapTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/immutable/MultiMapTest.scala rename to src/test/scala/scala/collection/immutable/MultiMapTest.scala diff --git a/shared/src/test/scala/scala/collection/immutable/MultiSetTest.scala b/src/test/scala/scala/collection/immutable/MultiSetTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/immutable/MultiSetTest.scala rename to src/test/scala/scala/collection/immutable/MultiSetTest.scala diff --git a/shared/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala b/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala rename to src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala diff --git a/shared/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala b/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala rename to src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala diff --git a/shared/src/test/scala/scala/collection/mutable/MultiMapTest.scala b/src/test/scala/scala/collection/mutable/MultiMapTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/mutable/MultiMapTest.scala rename to src/test/scala/scala/collection/mutable/MultiMapTest.scala diff --git a/shared/src/test/scala/scala/collection/mutable/MultiSetTest.scala b/src/test/scala/scala/collection/mutable/MultiSetTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/mutable/MultiSetTest.scala rename to src/test/scala/scala/collection/mutable/MultiSetTest.scala diff --git a/shared/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala b/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala rename to src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala diff --git a/shared/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala b/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala similarity index 100% rename from shared/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala rename to src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala