summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2016-04-04 13:28:30 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2016-04-04 13:28:30 -0700
commit1046ff24bd8f75caaee949a0425b0229e7c0a8fd (patch)
tree13536e1f3a9a173acf5cd9c7f11447f4c624a430
parentd8aa2cdfb83de35cc0e427f26530195ccff46d51 (diff)
parent9fb83dd23b6761e4fd684a25351abc772474bea3 (diff)
downloadscala-1046ff24bd8f75caaee949a0425b0229e7c0a8fd.tar.gz
scala-1046ff24bd8f75caaee949a0425b0229e7c0a8fd.tar.bz2
scala-1046ff24bd8f75caaee949a0425b0229e7c0a8fd.zip
Merge pull request #5081 from adriaanm/2.12.x
Bump STARR to 2.12.0-M4.
-rw-r--r--versions.properties4
1 files changed, 2 insertions, 2 deletions
diff --git a/versions.properties b/versions.properties
index 319ff842c3..d4112325d2 100644
--- a/versions.properties
+++ b/versions.properties
@@ -8,7 +8,7 @@
# The scala version used for bootstrapping. 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.12.0-M3-dc9effe
+starr.version=2.12.0-M4
# 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.12.0-M3-dc9effe
# - 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-M2).
-scala.binary.version=2.12.0-M3-dc9effe
+scala.binary.version=2.12.0-M4
# external modules shipped with distribution, as specified by scala-library-all's pom
scala-xml.version.number=1.0.5