summaryrefslogtreecommitdiff
path: root/versions.properties
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2015-04-21 12:44:27 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2015-05-06 09:28:26 +0200
commitd3d44eedb380db355373629b9fbc624b3abe2512 (patch)
tree63445735e5a8848652b7e7b1206a2acf4ce17b4f /versions.properties
parentf3f1800b8b8d948c7d859b5139328bdfdd29d518 (diff)
downloadscala-d3d44eedb380db355373629b9fbc624b3abe2512.tar.gz
scala-d3d44eedb380db355373629b9fbc624b3abe2512.tar.bz2
scala-d3d44eedb380db355373629b9fbc624b3abe2512.zip
[backport] Comments in versions.properties
Backport of f9153619380d755a531f887fe0bd63b6e6a91738
Diffstat (limited to 'versions.properties')
-rw-r--r--versions.properties10
1 files changed, 8 insertions, 2 deletions
diff --git a/versions.properties b/versions.properties
index ce38e0d50c..41af863c88 100644
--- a/versions.properties
+++ b/versions.properties
@@ -3,13 +3,19 @@
# via scala-dist-pom.xml and scala-library-all-pom.xml
# when adding new properties that influence a release,
# also add them to the update.versions mechanism in build.xml,
-# which is used by scala-release-2.11.x in scala/jenkins-scripts
+# which is used by the release script scripts/jobs/integrate/bootstrap
+
+# The scala version used for boostrapping. 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.6
# These are the versions of the modules that go with this release.
# These properties are used during PR validation and in dbuild builds.
-# e.g. 2.11.0-RC1, 2.11
+# The scala.binary.version determines how modules are resolved. After 2.x.0 is released,
+# the binary version is 2.x. For milestones and RCs, modules are cross-built against the
+# full version, so the value, so the value is the full version (e.g. 2.12.0-M1).
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