Add Scala.js cross build

scala · Jul 27, 2019 · f200629 · f200629
1 parent 649e28e
commit f200629
Show file tree

Hide file tree

Showing 36 changed files with 50 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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/...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