From 7f118479888638b853aad74bad790cb10beaddae Mon Sep 17 00:00:00 2001
From: George Leontiev <folone@gmail.com>
Date: Mon, 23 Jun 2014 13:46:40 +0200
Subject: Use the final scala 2.11.

---
 bin/dotc                 | 5 +++--
 build.sbt                | 2 +-
 project/build.properties | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/dotc b/bin/dotc
index eaaf9c768..cafd80f03 100755
--- a/bin/dotc
+++ b/bin/dotc
@@ -4,7 +4,8 @@
 
 
 # Configuration
-SCALA_VERSION=2.11.0-M7
+SCALA_VERSION=2.11.1
+SCALA_BINARY_VERSION=2.11
 DOTTY_VERSION=0.1
 bootcp=true
 default_java_opts="-Xmx768m -Xms768m"
@@ -29,7 +30,7 @@ fi
 DOTTY_ROOT="`dirname \"$DOTTY_ROOT\"`"
 DOTTY_ROOT="`( cd \"$DOTTY_ROOT\" && pwd )`/.."  # absolute
 # autodetecting the compiler jar. this is location where sbt 'packages' it
-MAIN_JAR=$DOTTY_ROOT/target/scala-$SCALA_VERSION/dotty_$SCALA_VERSION-$DOTTY_VERSION-SNAPSHOT.jar
+MAIN_JAR=$DOTTY_ROOT/target/scala-$SCALA_BINARY_VERSION/dotty_$SCALA_BINARY_VERSION-$DOTTY_VERSION-SNAPSHOT.jar
 
 function checkjar {
   if [ ! -f "$1" ]
diff --git a/build.sbt b/build.sbt
index 460a4617d..86164dbb7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,7 @@
 
 name := "dotty"
 
-scalaVersion in Global := "2.11.0-RC3"
+scalaVersion in Global := "2.11.1"
 
 version in Global := "0.1-SNAPSHOT"
 
diff --git a/project/build.properties b/project/build.properties
index 0974fce44..be6c454fb 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.0
+sbt.version=0.13.5
-- 
cgit v1.2.3