Merge pull request scala-js#3 from sjrd/scala-js-0.6.6

Upgrade to vanilla Scala.js 0.6.6.

Author: nicolasstucki

.travis.yml

@@ -1,11 +1,5 @@
 sudo: false
 language: scala
-install:
-  - git clone https://github.com/scala-js/scala-js.git
-  - cd scala-js
-  - sbt ++$TRAVIS_SCALA_VERSION compiler/publishLocal library/publishLocal javalibEx/publishLocal testInterface/publishLocal stubs/publishLocal jasmineTestFramework/publishLocal jUnitRuntime/publishLocal jUnitPlugin/publishLocal
-  - sbt ++2.10.6 ir/publishLocal tools/publishLocal jsEnvs/publishLocal testAdapter/publishLocal sbtPlugin/publishLocal
-  - cd ..
 script:
   - sbt ++$TRAVIS_SCALA_VERSION root/scalastyle testSuiteJVM/scalastyle testSuiteJVM/test:scalastyle testSuite/scalastyle testSuite/test:scalastyle
   - sbt ++$TRAVIS_SCALA_VERSION testSuiteJVM/test

build.sbt

@@ -1,8 +1,21 @@
 import sbt.Keys._
 import org.scalajs.sbtplugin.cross.CrossProject
 
+val commonSettings: Seq[Setting[_]] = Seq(
+  version := "0.0.1-SNAPSHOT",
+  organization := "org.scala-js",
+  scalaVersion := "2.11.7",
+  scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
+  homepage := Some(url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3Ehttp://scala-js.org/%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3E%3C/span%3E)),
+  licenses += ("MIT", url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3Ehttp://opensource.org/licenses/mit-license.php%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3E%3C/span%3E))
+)
+
 lazy val root: Project = project.in(file(".")).
-  enablePlugins(ScalaJSPlugin)
+  enablePlugins(ScalaJSPlugin).
+  settings(commonSettings).
+  settings(
+    name := "scalajs-java-time"
+  )
 
 lazy val testSuite = CrossProject(
   jvmId = "testSuiteJVM",
@@ -11,32 +24,20 @@ lazy val testSuite = CrossProject(
   crossType = CrossType.Full
 ).
   jsConfigure(_ .enablePlugins(ScalaJSJUnitPlugin)).
+  settings(commonSettings: _*).
   settings(
     testOptions +=
       Tests.Argument(TestFramework("com.novocode.junit.JUnitFramework"), "-v", "-a")
   ).
   jsSettings(
     name := "java.time testSuite on JS"
   ).
+  jsConfigure(_.dependsOn(root)).
   jvmSettings(
     name := "java.time testSuite on JVM",
     libraryDependencies +=
       "com.novocode" % "junit-interface" % "0.9" % "test"
   )
 
-lazy val testSuiteJS = testSuite.js.dependsOn(root)
-lazy val testSuiteJVM = testSuite.jvm.dependsOn(root)
-
-name := "scalajs-java-time"
-
-version := "0.0.1-SNAPSHOT"
-
-organization := "org.scala-js"
-
-scalaVersion := "2.11.7"
-
-scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")
-
-homepage := Some(url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3Ehttp://scala-js.org/%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3E%3C/span%3E))
-
-licenses += ("MIT", url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3Ehttp://opensource.org/licenses/mit-license.php%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3E%3C/span%3E))
+lazy val testSuiteJS = testSuite.js
+lazy val testSuiteJVM = testSuite.jvm

project/build.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.6-SNAPSHOT")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.6")
 
 addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")