summaryrefslogtreecommitdiff
path: root/versions.properties
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2016-09-07 14:17:35 -0700
committerSeth Tisue <seth@tisue.net>2016-10-24 17:45:52 -0700
commite0a8ffe88740995150fa7ca58797a4cceed3169f (patch)
tree79e2dade4a231364d2aedc8e8f8f0d0b034a87c4 /versions.properties
parent501c21260cff006e7cf2e79739d8319c4dc79901 (diff)
downloadscala-e0a8ffe88740995150fa7ca58797a4cceed3169f.tar.gz
scala-e0a8ffe88740995150fa7ca58797a4cceed3169f.tar.bz2
scala-e0a8ffe88740995150fa7ca58797a4cceed3169f.zip
assorted typo fixes, cleanup, updating of comments
just in time for Halloween. "boostrap" is definitely the most adorable typo evah -- and one of the most common, too. but we don't want to scare anybody.
Diffstat (limited to 'versions.properties')
-rw-r--r--versions.properties32
1 files changed, 10 insertions, 22 deletions
diff --git a/versions.properties b/versions.properties
index 1f43b9cc56..950f73baa1 100644
--- a/versions.properties
+++ b/versions.properties
@@ -1,24 +1,14 @@
-#Mon, 05 Oct 2015 14:25:00 +0000
-# NOTE: this file determines the content of the scala-distribution
-# 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 the release script scripts/jobs/integrate/bootstrap
-
-# 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).
+# Scala version used for bootstrapping. (This has no impact on the
+# final classfiles, since compiler and library are built first using
+# starr, then rebuilt using themselves.)
starr.version=2.12.0-RC1-1e81a09
-# These are the versions of the modules that go with this release.
-# These properties are used during PR validation and in dbuild builds.
-
-# The scala.binary.version determines how modules are resolved. For example, it
-# determines which partest artifact is being used for running the tests.
-# It has to be set in the following way:
+# Set in the following way:
# - 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).
+# Also determines how modules are resolved. For example, it determines which
+# partest artifact is being used for running the tests.
scala.binary.version=2.12.0-RC1
# external modules shipped with distribution, as specified by scala-library-all's pom
@@ -27,14 +17,12 @@ scala-parser-combinators.version.number=1.0.4
scala-swing.version.number=2.0.0-M2
scala-swing.version.osgi=2.0.0.M2
jline.version=2.14.1
+# this one is shaded and embedded in scala-compiler.jar
scala-asm.version=5.1.0-scala-1
# external modules, used internally (not shipped)
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
-# TODO: modularize the compiler
-#scala-compiler-doc.version.number=1.0.0-RC1
-#scala-compiler-interactive.version.number=1.0.0-RC1
+# TODO: We've embedded these sources in partest-extras for now.
+# after 2.12.0 is out, we can switch back to a public release.
+# scalacheck.version.number=1.11.6