Upgrade to Scala.js 0.6.0-M1 and Scala 2.11.2.

scala-js · sjrd · Nov 30, 2014 · Nov 29, 2014 · Nov 29, 2014 · Nov 29, 2014
commit ede07141d153780f442014cd0a33836298e1c107
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ after_success:
  - if [[ "${PUBLISH_ENABLED}" == "true" && "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "master" && "${PUBLISH_USER}" != "" && "${PUBLISH_PASS}" != "" ]]; then sbt ++$TRAVIS_SCALA_VERSION publish; fi
 scala:
  - 2.10.4
- - 2.11.1
+ - 2.11.2
 jdk:
  - oraclejdk7
 env:

diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,5 @@
-scalaJSSettings
+lazy val root = project.in(file(".")).
+ enablePlugins(ScalaJSPlugin)
 
 name := "Scala.js DOM"
 
@@ -8,9 +9,9 @@ version := "0.7.0-SNAPSHOT"
 
 organization := "org.scala-lang.modules.scalajs"
 
-scalaVersion := "2.11.1"
+scalaVersion := "2.11.2"
 
-crossScalaVersions := Seq("2.10.4", "2.11.1")
+crossScalaVersions := Seq("2.10.4", "2.11.2")
 
 homepage := Some(url("http://scala-js.org/"))
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.0
+sbt.version=0.13.7
diff --git a/project/build.sbt b/project/build.sbt
@@ -1,5 +1,9 @@
+resolvers += Resolver.url("scala-js-releases",
+ url("http://dl.bintray.com/scala-js/scala-js-releases/"))(
+ Resolver.ivyStylePatterns)
+
 addSbtPlugin("me.lessis" % "bintray-sbt" % "0.1.1")
 
-addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0-M1")
 
 addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ after_success: @@
   - if [[ "${PUBLISH_ENABLED}" == "true" && "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "master" && "${PUBLISH_USER}" != "" && "${PUBLISH_PASS}" != "" ]]; then sbt ++$TRAVIS_SCALA_VERSION publish; fi
  scala:
   - 2.10.4
-  - 2.11.1
+  - 2.11.2
  jdk:
   - oraclejdk7
  env:
@@ Expand Down @@