From 15ee18f5ba4fa790890dd3b6eb168df3f59936f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= <sjrdoeraene@gmail.com>
Date: Sat, 10 Jan 2015 11:49:40 +0100
Subject: [PATCH] Upgrade to Scala.js 0.6.0-RC1 and Scala 2.11.5.

---
 .travis.yml       | 2 +-
 build.sbt         | 4 ++--
 project/build.sbt | 6 +-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9eb8ac0aa..dad894619 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,6 @@ script:
   - sbt ++2.11.4 readme/run
 scala:
   - 2.10.4
-  - 2.11.2
+  - 2.11.5
 jdk:
   - oraclejdk7
diff --git a/build.sbt b/build.sbt
index db8857d10..5b4e01661 100644
--- a/build.sbt
+++ b/build.sbt
@@ -9,9 +9,9 @@ version := "0.7.1-SNAPSHOT"
 
 organization := "org.scala-js"
 
-scalaVersion := "2.11.2"
+scalaVersion := "2.11.5"
 
-crossScalaVersions := Seq("2.10.4", "2.11.2")
+crossScalaVersions := Seq("2.10.4", "2.11.5")
 
 scalacOptions ++= Seq("-deprecation", "-feature")
 
diff --git a/project/build.sbt b/project/build.sbt
index 718ecd2a4..aadbe71f5 100644
--- a/project/build.sbt
+++ b/project/build.sbt
@@ -1,7 +1,3 @@
-resolvers += Resolver.url("scala-js-releases",
-    url("http://dl.bintray.com/scala-js/scala-js-releases/"))(
-    Resolver.ivyStylePatterns)
-
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0-M1")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0-RC1")
 
 addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.1.0")