diff options
| author | Seth Tisue <seth@tisue.net> | 2015-07-16 12:57:49 -0400 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2015-07-16 12:57:49 -0400 |
| commit | 2595b11eb2758459b973d68e4a670b5c88b43e4a (patch) | |
| tree | 0fd21d4c8cac191ea0bd2b12c68362a9bc1cefa2 | |
| parent | 84850fa318d4efc3b6077764cc911a38bf8265ba (diff) | |
| parent | c9abbe037c863d7af71ebabdb21a2a4f35314093 (diff) | |
| download | scala-2595b11eb2758459b973d68e4a670b5c88b43e4a.tar.gz scala-2595b11eb2758459b973d68e4a670b5c88b43e4a.tar.bz2 scala-2595b11eb2758459b973d68e4a670b5c88b43e4a.zip | |
Merge pull request #4635 from SethTisue/post-m2-version-bumps
bump versions.properties now that 2.12.0-M2 is out
| -rw-r--r-- | versions.properties | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/versions.properties b/versions.properties index ad3d659aee..be197af2ac 100644 --- a/versions.properties +++ b/versions.properties @@ -5,10 +5,10 @@ # also add them to the update.versions mechanism in build.xml, # which is used by the release script scripts/jobs/integrate/bootstrap -# The scala version used for boostrapping. This has no impact on the final classfiles: +# 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-M1 +starr.version=2.12.0-M2 # These are the versions of the modules that go with this release. # These properties are used during PR validation and in dbuild builds. @@ -18,8 +18,8 @@ starr.version=2.12.0-M1 # It has to be set in the following way: # - 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.12.0-M1 +# So the value is the full version (e.g. 2.12.0-M2). +scala.binary.version=2.12.0-M2 # external modules shipped with distribution, as specified by scala-library-all's pom scala-xml.version.number=1.0.4 |