Skip to content

Commit

Permalink
Merge pull request scala#4635 from SethTisue/post-m2-version-bumps
Browse files Browse the repository at this point in the history
bump versions.properties now that 2.12.0-M2 is out
  • Loading branch information
SethTisue committed Jul 16, 2015
2 parents 84850fa + c9abbe0 commit 2595b11
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions versions.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down

0 comments on commit 2595b11

Please sign in to comment.