summaryrefslogtreecommitdiff
path: root/versions.properties
diff options
context:
space:
mode:
Diffstat (limited to 'versions.properties')
-rw-r--r--versions.properties13
1 files changed, 3 insertions, 10 deletions
diff --git a/versions.properties b/versions.properties
index a7ec8caedc..470c9341cd 100644
--- a/versions.properties
+++ b/versions.properties
@@ -1,4 +1,4 @@
-#Wed, 23 Jul 2014 08:37:26 +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,19 +19,12 @@ 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
-# e.g. 2.11.0-RC1, 2.11.0, 2.11.1-RC1, 2.11.1
-# this defines the dependency on scala-continuations-plugin in scala-dist's pom
-scala.full.version=2.11.6
+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
scala-parser-combinators.version.number=1.0.4
-scala-continuations-plugin.version.number=1.0.2
-scala-continuations-library.version.number=1.0.2
scala-swing.version.number=1.0.2
-akka-actor.version.number=2.3.10
-actors-migration.version.number=1.1.0
jline.version=2.12.1
scala-asm.version=5.0.4-scala-1