summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2014-11-04 14:39:39 +0100
committerLukas Rytz <lukas.rytz@typesafe.com>2014-11-04 14:39:39 +0100
commitf3bf6136bfff650c3078aa7cd383604d5140ca61 (patch)
tree9bae6114740ab503be839429c75286b6fd6e63d5 /src/compiler
parentb556b2fdcc7198bffe0ee90c5adc8c9eb3c29e36 (diff)
parent2f54eb350038c48d0f0aadc6c8793ea0ef9ff80c (diff)
downloadscala-f3bf6136bfff650c3078aa7cd383604d5140ca61.tar.gz
scala-f3bf6136bfff650c3078aa7cd383604d5140ca61.tar.bz2
scala-f3bf6136bfff650c3078aa7cd383604d5140ca61.zip
Merge pull request #4046 from gourlaysama/wip/t8711-version-unparse
SI-8711 ScalaVersion.unparse doesn't produce valid versions
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/settings/ScalaVersion.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaVersion.scala b/src/compiler/scala/tools/nsc/settings/ScalaVersion.scala
index 4f45043c5e..43bdad5882 100644
--- a/src/compiler/scala/tools/nsc/settings/ScalaVersion.scala
+++ b/src/compiler/scala/tools/nsc/settings/ScalaVersion.scala
@@ -34,7 +34,7 @@ case object NoScalaVersion extends ScalaVersion {
* to segregate builds
*/
case class SpecificScalaVersion(major: Int, minor: Int, rev: Int, build: ScalaBuild) extends ScalaVersion {
- def unparse = s"${major}.${minor}.${rev}.${build.unparse}"
+ def unparse = s"${major}.${minor}.${rev}${build.unparse}"
def compare(that: ScalaVersion): Int = that match {
case SpecificScalaVersion(thatMajor, thatMinor, thatRev, thatBuild) =>