Skip to content

Commit 38b00c5

Browse files
committed
Merge pull request #138 from folone/master
Use the final scala 2.11.
2 parents a8cb929 + 7f11847 commit 38b00c5

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

bin/dotc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55

66
# Configuration
7-
SCALA_VERSION=2.11.0-M7
7+
SCALA_VERSION=2.11.1
8+
SCALA_BINARY_VERSION=2.11
89
DOTTY_VERSION=0.1
910
bootcp=true
1011
default_java_opts="-Xmx768m -Xms768m"
@@ -29,7 +30,7 @@ fi
2930
DOTTY_ROOT="`dirname \"$DOTTY_ROOT\"`"
3031
DOTTY_ROOT="`( cd \"$DOTTY_ROOT\" && pwd )`/.." # absolute
3132
# autodetecting the compiler jar. this is location where sbt 'packages' it
32-
MAIN_JAR=$DOTTY_ROOT/target/scala-$SCALA_VERSION/dotty_$SCALA_VERSION-$DOTTY_VERSION-SNAPSHOT.jar
33+
MAIN_JAR=$DOTTY_ROOT/target/scala-$SCALA_BINARY_VERSION/dotty_$SCALA_BINARY_VERSION-$DOTTY_VERSION-SNAPSHOT.jar
3334

3435
function checkjar {
3536
if [ ! -f "$1" ]

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
name := "dotty"
33

4-
scalaVersion in Global := "2.11.0-RC3"
4+
scalaVersion in Global := "2.11.1"
55

66
version in Global := "0.1-SNAPSHOT"
77

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.0
1+
sbt.version=0.13.5

0 commit comments

Comments
 (0)