aboutsummaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2017-01-08 20:04:52 +0100
committerGuillaume Martres <smarter@ubuntu.com>2017-01-08 20:11:44 +0100
commit0bca6b76ee6c7c9555707d03551593dd04b5fe81 (patch)
tree7c79cfb5b3d218060b858c1ebc5aaf9b6b5ce968 /compiler
parenta909c2fc9e95a227553ce3b0decc3aeec28b5d57 (diff)
downloaddotty-0bca6b76ee6c7c9555707d03551593dd04b5fe81.tar.gz
dotty-0bca6b76ee6c7c9555707d03551593dd04b5fe81.tar.bz2
dotty-0bca6b76ee6c7c9555707d03551593dd04b5fe81.zip
Bump version from 0.1-SNAPSHOT to 0.1.1-SNAPSHOT
This is useful for two reasons: - All published Scala versions are of the form a.b.c and some tooling expect that, like sbt CrossVersion API. - Using 0.1.1 instead of 0.1.0 means that we match the version number of dotty-sbt-bridge, this is simpler and means that in the future sbt could automatically choose the correct version of dotty-sbt-bridge so that the user does not need to specify scalaCompilerBridgeSource in his build.sbt Note: it's awful that we have hardcoded paths to jars and that I had to change them, but I won't fix that now.
Diffstat (limited to 'compiler')
-rw-r--r--compiler/test/dotc/tests.scala2
-rw-r--r--compiler/test/dotty/Jars.scala6
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/test/dotc/tests.scala b/compiler/test/dotc/tests.scala
index eecb068fe..fd8b005a9 100644
--- a/compiler/test/dotc/tests.scala
+++ b/compiler/test/dotc/tests.scala
@@ -279,7 +279,7 @@ class tests extends CompilerTest {
@Test def dotc_typer = compileDir(dotcDir, "typer")// twice omitted to make tests run faster
// error: error while loading Checking$$anon$2$,
- // class file 'target/scala-2.11/dotty_2.11-0.1-SNAPSHOT.jar(dotty/tools/dotc/typer/Checking$$anon$2.class)'
+ // class file 'target/scala-2.11/dotty_2.11-0.1.1-SNAPSHOT.jar(dotty/tools/dotc/typer/Checking$$anon$2.class)'
// has location not matching its contents: contains class $anon
@Test def dotc_util = compileDir(dotcDir, "util") // twice omitted to make tests run faster
diff --git a/compiler/test/dotty/Jars.scala b/compiler/test/dotty/Jars.scala
index 42c707069..6fc9b0fde 100644
--- a/compiler/test/dotty/Jars.scala
+++ b/compiler/test/dotty/Jars.scala
@@ -3,15 +3,15 @@ package dotty
/** Jars used when compiling test, defaults to sbt locations */
object Jars {
val dottyLib: String = sys.env.get("DOTTY_LIB") getOrElse {
- "../library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar"
+ "../library/target/scala-2.11/dotty-library_2.11-0.1.1-SNAPSHOT.jar"
}
val dottyCompiler: String = sys.env.get("DOTTY_COMPILER") getOrElse {
- "./target/scala-2.11/dotty-compiler_2.11-0.1-SNAPSHOT.jar"
+ "./target/scala-2.11/dotty-compiler_2.11-0.1.1-SNAPSHOT.jar"
}
val dottyInterfaces: String = sys.env.get("DOTTY_INTERFACE") getOrElse {
- "../interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar"
+ "../interfaces/target/dotty-interfaces-0.1.1-SNAPSHOT.jar"
}
val dottyExtras: List[String] = sys.env.get("DOTTY_EXTRAS")