Merge pull request #94 from cquiroz/cross-compile

Cross compile

Author: cquiroz

.travis.yml

@@ -3,21 +3,24 @@ language: scala
 scala:
   - 2.10.6
   - 2.11.8
-  - 2.12.0
+  - 2.12.2
 jdk:
   - oraclejdk8
 env:
-  - TRAVIS_NODE_VERSION="5.12.0"
-  - TRAVIS_NODE_VERSION="6.10.0"
-  - TRAVIS_NODE_VERSION="7.6.0"
+  - TRAVIS_NODE_VERSION="5.12.0" SCALAJS_VERSION="0.6.18"
+  - TRAVIS_NODE_VERSION="5.12.0" SCALAJS_VERSION="1.0.0-M1"
+  - TRAVIS_NODE_VERSION="6.10.0" SCALAJS_VERSION="0.6.18"
+  - TRAVIS_NODE_VERSION="6.10.0" SCALAJS_VERSION="1.0.0-M1"
+  - TRAVIS_NODE_VERSION="7.6.0" SCALAJS_VERSION="0.6.18"
+  - TRAVIS_NODE_VERSION="7.6.0" SCALAJS_VERSION="1.0.0-M1"
 install:
   - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
   - npm install
 script:
   - sbt -Djava.locale.providers=CLDR ++$TRAVIS_SCALA_VERSION macroUtils/publishLocal
-  - sbt -Djava.locale.providers=CLDR ++$TRAVIS_SCALA_VERSION coreJS/scalastyle testSuiteJVM/scalastyle testSuiteJVM/test:scalastyle testSuite/scalastyle testSuite/test:scalastyle
+  - sbt -Djava.locale.providers=CLDR ++$TRAVIS_SCALA_VERSION coreJS/scalastyle testSuiteJVM/scalastyle testSuiteJVM/test:scalastyle testSuiteJS/scalastyle testSuiteJS/test:scalastyle
   - sbt -Djava.locale.providers=CLDR ++$TRAVIS_SCALA_VERSION testSuiteJVM/test
-  - sbt -Djava.locale.providers=CLDR ++$TRAVIS_SCALA_VERSION '; set scalaJSStage in Global := FullOptStage' testSuite/test
+  - sbt -Djava.locale.providers=CLDR ++$TRAVIS_SCALA_VERSION '; set scalaJSStage in Global := FullOptStage' testSuiteJS/test
   # Tricks to avoid unnecessary cache updates, from
   # http://www.scala-sbt.org/0.13/docs/Travis-CI-with-sbt.html
   - find $HOME/.sbt -name "*.lock" | xargs rm

build.sbt

@@ -1,4 +1,3 @@
-import org.scalajs.sbtplugin.cross.CrossProject
 import sbt.Keys._
 import LDMLTasks._
 
@@ -8,10 +7,10 @@ lazy val downloadFromZip: TaskKey[Unit] =
 
 val commonSettings: Seq[Setting[_]] = Seq(
   cldrVersion := "31",
-  version := s"0.3.5-cldr${cldrVersion.value}",
+  version := s"0.3.6-cldr${cldrVersion.value}",
   organization := "io.github.cquiroz",
   scalaVersion := "2.11.11",
-  crossScalaVersions := Seq("2.10.4", "2.11.11", "2.12.2"),
+  crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.2"),
     scalacOptions ++= Seq("-deprecation", "-feature"),
   scalacOptions := {
     CrossVersion.partialVersion(scalaVersion.value) match {
@@ -69,7 +68,8 @@ lazy val scalajs_locales: Project = project.in(file("."))
   )
   .aggregate(coreJS, coreJVM, testSuiteJS, testSuiteJVM)
 
-lazy val core: CrossProject = crossProject.crossType(CrossType.Pure).
+lazy val core = crossProject.
+  crossType(CrossType.Pure).
   settings(commonSettings: _*).
   settings(
     name := "scala-java-locales",
@@ -96,7 +96,7 @@ lazy val coreJS: Project = core.js
   .settings(
     scalacOptions ++= {
       val tagOrHash =
-        if(isSnapshot.value) sys.process.Process("git rev-parse HEAD").lines_!.head
+        if (isSnapshot.value) sys.process.Process("git rev-parse HEAD").lines_!.head
         else s"v${version.value}"
       (sourceDirectories in Compile).value.map { dir =>
         val a = dir.toURI.toString
@@ -108,12 +108,7 @@ lazy val coreJS: Project = core.js
 
 lazy val coreJVM: Project = core.jvm
 
-lazy val testSuite: CrossProject = CrossProject(
-  jvmId = "testSuiteJVM",
-  jsId = "testSuite",
-  base = file("testSuite"),
-  crossType = CrossType.Full).
-  jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin)).
+lazy val testSuite = crossProject.
   settings(commonSettings: _*).
   settings(
     publish := {},
@@ -127,10 +122,11 @@ lazy val testSuite: CrossProject = CrossProject(
     parallelExecution in Test := false,
     name := "scala-java-locales testSuite on JS",
     libraryDependencies ++= Seq(
+      "com.novocode" % "junit-interface" % "0.9" % "test",
       "io.github.cquiroz" %% "macroutils" % "0.0.1" % "provided"
     )
   ).
-  jsConfigure(_.dependsOn(coreJS)).
+  jsConfigure(_.dependsOn(coreJS, macroUtils)).
   jvmSettings(
     // Fork the JVM test to ensure that the custom flags are set
     fork in Test := true,
@@ -143,7 +139,7 @@ lazy val testSuite: CrossProject = CrossProject(
       "io.github.cquiroz" %% "macroutils" % "0.0.1" % "provided"
     )
   ).
-  jvmConfigure(_.dependsOn(coreJVM))
+  jvmConfigure(_.dependsOn(coreJVM, macroUtils))
 
 lazy val macroUtils = project.in(file("macroUtils")).
   settings(commonSettings).

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.13
+sbt.version=0.13.15

project/plugins.sbt

@@ -1,4 +1,7 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.17")
+val scalaJSVersion =
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.18")
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")