Merge pull request scala-js#15 from sjrd/support-scalajs-1.x

Add cross-building support with Scala.js 1.0.0-M1.

Author: gzm0

.travis.yml

@@ -1,14 +1,18 @@
 sudo: false
 language: scala
 script:
-  - sbt ++$TRAVIS_SCALA_VERSION root/scalastyle testSuiteJVM/scalastyle testSuiteJVM/test:scalastyle testSuite/scalastyle testSuite/test:scalastyle
+  - sbt ++$TRAVIS_SCALA_VERSION root/scalastyle testSuiteJVM/scalastyle testSuiteJVM/test:scalastyle testSuiteJS/scalastyle testSuiteJS/test:scalastyle
   - sbt ++$TRAVIS_SCALA_VERSION testSuiteJVM/test
-  - sbt ++$TRAVIS_SCALA_VERSION testSuite/test
-  - sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSStage in Global := FullOptStage' testSuite/test
+  - sbt ++$TRAVIS_SCALA_VERSION testSuiteJS/test
+  - sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSStage in Global := FullOptStage' testSuiteJS/test
   - sbt ++$TRAVIS_SCALA_VERSION publishLocal
 scala:
   - 2.10.6
-  - 2.11.8
-  - 2.12.1
+  - 2.11.11
+  - 2.12.2
+  - 2.13.0-M1
 jdk:
   - oraclejdk8
+env:
+  - SCALAJS_VERSION=0.6.18
+  - SCALAJS_VERSION=1.0.0-M1

build.sbt

@@ -1,12 +1,9 @@
-import sbt.Keys._
-import org.scalajs.sbtplugin.cross.CrossProject
-
-crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.1")
+crossScalaVersions in ThisBuild := Seq("2.11.11", "2.10.6", "2.12.2", "2.13.0-M1")
+scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild).value.head
 
 val commonSettings: Seq[Setting[_]] = Seq(
   version := "0.1.2-SNAPSHOT",
   organization := "org.scala-js",
-  scalaVersion := "2.11.8",
   scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
 
   homepage := Some(url("http://scala-js.org/")),
@@ -59,12 +56,7 @@ lazy val root: Project = project.in(file(".")).
     pomIncludeRepository := { _ => false }
   )
 
-lazy val testSuite = CrossProject(
-  jvmId = "testSuiteJVM",
-  jsId = "testSuite",
-  base = file("testSuite"),
-  crossType = CrossType.Full
-).
+lazy val testSuite = crossProject.
   jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin)).
   settings(commonSettings: _*).
   settings(

project/build.properties

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

project/build.sbt

@@ -1,3 +1,6 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.15")
+val scalaJSVersion =
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.18")
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 
 addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")