summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2017-03-03 17:48:24 +0100
committerLukas Rytz <lukas.rytz@gmail.com>2017-03-09 08:40:24 +0100
commit42f813e18160b6ea8dfc9c2ae850a67dd0819773 (patch)
treefbeb43c2b5769cd0a29b7b3dffe4a68d34710a20 /src
parent828a8923c4f1c6c6c884a18675e2effa91c73197 (diff)
downloadscala-42f813e18160b6ea8dfc9c2ae850a67dd0819773.tar.gz
scala-42f813e18160b6ea8dfc9c2ae850a67dd0819773.tar.bz2
scala-42f813e18160b6ea8dfc9c2ae850a67dd0819773.zip
[backport] new repo, version numbers for integration builds
Integration builds now have version number like `2.12.2-bin-sha7` or `2.13.0-pre-sha7` and are published to scala-integration (no longer scala-release-temp). scala-release-temp is still used in the bootstrap script for publishing locker.
Diffstat (limited to 'src')
-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 43bdad5882..d7901730a4 100644
--- a/src/compiler/scala/tools/nsc/settings/ScalaVersion.scala
+++ b/src/compiler/scala/tools/nsc/settings/ScalaVersion.scala
@@ -135,7 +135,7 @@ abstract class ScalaBuild extends Ordered[ScalaBuild] {
def unparse: String
}
/**
- * A development, test, nightly, snapshot or other "unofficial" build
+ * A development, test, integration, snapshot or other "unofficial" build
*/
case class Development(id: String) extends ScalaBuild {
def unparse = s"-${id}"