From 008ccfed3485d960a7bc3f69e73e6411421367d8 Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Thu, 30 Apr 2015 14:33:25 +0200 Subject: [backport] Update versions.properites The tagged revisions of the modules integrate the latest release of the sbt-scala-modules sbt plugin. This enables building with a new scala binary version (e.g. 2.12.0-M1) without failinig MiMa. Also updates the other external dependencies. Backport of 8da073cd6bfaaaf3789fc8b70a61ebb66a2f0ded --- test/files/scalacheck/redblacktree.scala | 2 +- versions.properties | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/test/files/scalacheck/redblacktree.scala b/test/files/scalacheck/redblacktree.scala index 871444a4b8..4ded37b35a 100644 --- a/test/files/scalacheck/redblacktree.scala +++ b/test/files/scalacheck/redblacktree.scala @@ -33,7 +33,7 @@ package scala.collection.immutable.redblacktree { def mkTree(level: Int, parentIsBlack: Boolean = false, label: String = ""): Gen[Tree[String, Int]] = if (level == 0) { - value(null) + const(null) } else { for { oddOrEven <- choose(0, 2) diff --git a/versions.properties b/versions.properties index 41af863c88..708ee38410 100644 --- a/versions.properties +++ b/versions.properties @@ -13,27 +13,30 @@ 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. -# 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). +# 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: +# - 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-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-xml.version.number=1.0.4 +scala-parser-combinators.version.number=1.0.4 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 +scala-swing.version.number=1.0.2 +akka-actor.version.number=2.3.10 actors-migration.version.number=1.1.0 jline.version=2.12.1 # external modules, used internally (not shipped) -partest.version.number=1.0.6 -scalacheck.version.number=1.11.4 +partest.version.number=1.0.7 +scalacheck.version.number=1.12.2 # TODO: modularize the compiler #scala-compiler-doc.version.number=1.0.0-RC1 -- cgit v1.2.3