summaryrefslogtreecommitdiff
path: root/versions.properties
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2016-03-09 18:35:09 -0500
committerSeth Tisue <seth@tisue.net>2016-03-09 18:35:09 -0500
commit22b79055a054c0095daf94fe5368042d509a1127 (patch)
treeed1370740dcfa2a691b338df05d1b3065eb7734e /versions.properties
parentbd4926fc01c5854fd1e228ac584fbc57529c2429 (diff)
parentfd7a15973d197d53b9c45dd06cb121372577e3f6 (diff)
downloadscala-22b79055a054c0095daf94fe5368042d509a1127.tar.gz
scala-22b79055a054c0095daf94fe5368042d509a1127.tar.bz2
scala-22b79055a054c0095daf94fe5368042d509a1127.zip
Merge branch '2.11.x' into newer-akka
Diffstat (limited to 'versions.properties')
-rw-r--r--versions.properties4
1 files changed, 2 insertions, 2 deletions
diff --git a/versions.properties b/versions.properties
index b4d066f9d2..7883f0e3c7 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.4