diff options
author | Seth Tisue <seth@tisue.net> | 2016-03-09 18:34:35 -0500 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2016-03-09 18:34:35 -0500 |
commit | 1ae6fc094e35e3ed816339721d1cd91457ac3bbe (patch) | |
tree | 75884f82e6408bc3438e9013b9b0301f9e3f5ea3 /versions.properties | |
parent | 76f633c5c1df3c5744dc24d5189ff139fd875544 (diff) | |
parent | fd7a15973d197d53b9c45dd06cb121372577e3f6 (diff) | |
download | scala-1ae6fc094e35e3ed816339721d1cd91457ac3bbe.tar.gz scala-1ae6fc094e35e3ed816339721d1cd91457ac3bbe.tar.bz2 scala-1ae6fc094e35e3ed816339721d1cd91457ac3bbe.zip |
Merge branch '2.11.x' into scala-xml-version-bump
Diffstat (limited to 'versions.properties')
-rw-r--r-- | versions.properties | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/versions.properties b/versions.properties index aa958cf5ec..8737558994 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.11.7 +starr.version=2.11.8 # These are the versions of the modules that go with this release. # These properties are used during PR validation and in dbuild builds. @@ -22,7 +22,7 @@ starr.version=2.11.7 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.7 +scala.full.version=2.11.8 # external modules shipped with distribution, as specified by scala-library-all's pom scala-xml.version.number=1.0.5 |