aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Leontiev <folone@gmail.com>2014-06-23 13:46:40 +0200
committerGeorge Leontiev <folone@gmail.com>2014-06-23 13:46:40 +0200
commit7f118479888638b853aad74bad790cb10beaddae (patch)
tree977d2952674f457fe536757bf1a731d98f044d90
parenta8cb929a368f01819c16393a97291e82bc4a2738 (diff)
downloaddotty-7f118479888638b853aad74bad790cb10beaddae.tar.gz
dotty-7f118479888638b853aad74bad790cb10beaddae.tar.bz2
dotty-7f118479888638b853aad74bad790cb10beaddae.zip
Use the final scala 2.11.
-rwxr-xr-xbin/dotc5
-rw-r--r--build.sbt2
-rw-r--r--project/build.properties2
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