diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-06-29 10:26:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-29 10:26:35 +0200 |
| commit | 79e24d52af441e728bf0c09fc054a00db693e07d (patch) | |
| tree | 36ef9af07fc6b2296e678459525bee3f4f55e861 /versions.properties | |
| parent | 7a7fdac795bdee3e05cda1327a570e59fbc9ce00 (diff) | |
| parent | d8c862b225cc7936e475419abaabb07226fea568 (diff) | |
| download | scala-79e24d52af441e728bf0c09fc054a00db693e07d.tar.gz scala-79e24d52af441e728bf0c09fc054a00db693e07d.tar.bz2 scala-79e24d52af441e728bf0c09fc054a00db693e07d.zip | |
Merge pull request #5251 from adriaanm/rebase-5177
Emit trait method bodies in statics [rebase of #5177]
Diffstat (limited to 'versions.properties')
| -rw-r--r-- | versions.properties | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/versions.properties b/versions.properties index 3b8077ab88..bf7c7d2faa 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-M4 +starr.version=2.12.0-M4-9901daf # 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-M4 # - 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-M4 +scala.binary.version=2.12.0-M4-9901daf # external modules shipped with distribution, as specified by scala-library-all's pom scala-xml.version.number=1.0.5 @@ -30,7 +30,7 @@ jline.version=2.14.1 scala-asm.version=5.0.4-scala-3 # external modules, used internally (not shipped) -partest.version.number=1.0.16 +partest.version.number=1.0.17 # We've embedded these sources in partest-extras for now. After 2.12.0 is released # we can switch to a public release. # scalacheck.version.number=1.11.6 |