summaryrefslogtreecommitdiff
path: root/versions.properties
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2015-05-04 14:26:22 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2015-05-05 10:37:58 +0200
commit48328cc2a2ae26cf6d6cec5da30605b1be6f0990 (patch)
tree4487158d53c07a0d1b88ef02dd7b42f72a194ccc /versions.properties
parent3953433343533626a209836ae6fd30b7d956b146 (diff)
downloadscala-48328cc2a2ae26cf6d6cec5da30605b1be6f0990.tar.gz
scala-48328cc2a2ae26cf6d6cec5da30605b1be6f0990.tar.bz2
scala-48328cc2a2ae26cf6d6cec5da30605b1be6f0990.zip
Update versions.properties after 2.12.0-M1
Use 2.12.0-M1 as starr. Also fixes comment in the bootstrap script.
Diffstat (limited to 'versions.properties')
-rw-r--r--versions.properties6
1 files changed, 3 insertions, 3 deletions
diff --git a/versions.properties b/versions.properties
index 2d7132769e..bf89804d5d 100644
--- a/versions.properties
+++ b/versions.properties
@@ -1,4 +1,4 @@
-#Tue, 20 May 2014 10:01:37 +0200
+#Fri, 01 May 2015 16:27:16 +0000
# NOTE: this file determines the content of the scala-distribution
# via scala-dist-pom.xml and scala-library-all-pom.xml
# when adding new properties that influence a release,
@@ -8,7 +8,7 @@
# The scala version used for boostrapping. This has no impact on the final classfiles:
# there are two stages (locker and quick), so compiler and library are always built
# with themselves. Stability is ensured by building a third stage (strap).
-starr.version=2.11.6
+starr.version=2.12.0-M1
# These are the versions of the modules that go with this release.
# These properties are used during PR validation and in dbuild builds.
@@ -19,7 +19,7 @@ starr.version=2.11.6
# - After 2.x.0 is released, the binary version is 2.x.
# - During milestones and RCs, modules are cross-built against the full version.
# So the value is the full version (e.g. 2.12.0-M1).
-scala.binary.version=2.11
+scala.binary.version=2.12.0-M1
# external modules shipped with distribution, as specified by scala-library-all's pom
scala-xml.version.number=1.0.4