diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-04-27 10:24:54 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-04-27 10:24:54 -0700 |
| commit | 236ee08ba25ada42b9cddf52a4a7c27158612b39 (patch) | |
| tree | f42468f667b9f560d7d668ee96138f74303d80db /versions.properties | |
| parent | a231f7dea1cff409c62902025f6d1ad76c71bcc5 (diff) | |
| parent | 7b54922b77fe1cf40177fc4a5ee9707bb5d854d2 (diff) | |
| download | scala-236ee08ba25ada42b9cddf52a4a7c27158612b39.tar.gz scala-236ee08ba25ada42b9cddf52a4a7c27158612b39.tar.bz2 scala-236ee08ba25ada42b9cddf52a4a7c27158612b39.zip | |
Merge pull request #4466 from lrytz/2.12-milestone
Prepare for the 2.12.0-M1 release
Diffstat (limited to 'versions.properties')
| -rw-r--r-- | versions.properties | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/versions.properties b/versions.properties index 49e7b2730b..ea0aa35d30 100644 --- a/versions.properties +++ b/versions.properties @@ -3,27 +3,26 @@ # 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 -starr.use.released=1 # 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 -scala.full.version=2.11.6 # external modules shipped with distribution, as specified by scala-library-all's pom scala-xml.version.number=1.0.3 scala-parser-combinators.version.number=1.0.3 -scala-continuations-plugin.version.number=1.0.2 -scala-continuations-library.version.number=1.0.2 scala-swing.version.number=1.0.1 akka-actor.version.number=2.3.4 -actors-migration.version.number=1.1.0 jline.version=2.12.1 # external modules, used internally (not shipped) |