Skip to content

Commit 008ccfe

Browse files
committed
[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 8da073c
1 parent e4f28ef commit 008ccfe

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

test/files/scalacheck/redblacktree.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ package scala.collection.immutable.redblacktree {
3333

3434
def mkTree(level: Int, parentIsBlack: Boolean = false, label: String = ""): Gen[Tree[String, Int]] =
3535
if (level == 0) {
36-
value(null)
36+
const(null)
3737
} else {
3838
for {
3939
oddOrEven <- choose(0, 2)

versions.properties

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,30 @@ starr.version=2.11.6
1313
# These are the versions of the modules that go with this release.
1414
# These properties are used during PR validation and in dbuild builds.
1515

16-
# The scala.binary.version determines how modules are resolved. After 2.x.0 is released,
17-
# the binary version is 2.x. For milestones and RCs, modules are cross-built against the
18-
# full version, so the value, so the value is the full version (e.g. 2.12.0-M1).
16+
# The scala.binary.version determines how modules are resolved. For example, it
17+
# determines which partest artifact is being used for running the tests.
18+
# It has to be set in the following way:
19+
# - After 2.x.0 is released, the binary version is 2.x.
20+
# - During milestones and RCs, modules are cross-built against the full version.
21+
# So the value is the full version (e.g. 2.12.0-M1).
1922
scala.binary.version=2.11
2023
# e.g. 2.11.0-RC1, 2.11.0, 2.11.1-RC1, 2.11.1
2124
# this defines the dependency on scala-continuations-plugin in scala-dist's pom
2225
scala.full.version=2.11.6
2326

2427
# external modules shipped with distribution, as specified by scala-library-all's pom
25-
scala-xml.version.number=1.0.3
26-
scala-parser-combinators.version.number=1.0.3
28+
scala-xml.version.number=1.0.4
29+
scala-parser-combinators.version.number=1.0.4
2730
scala-continuations-plugin.version.number=1.0.2
2831
scala-continuations-library.version.number=1.0.2
29-
scala-swing.version.number=1.0.1
30-
akka-actor.version.number=2.3.4
32+
scala-swing.version.number=1.0.2
33+
akka-actor.version.number=2.3.10
3134
actors-migration.version.number=1.1.0
3235
jline.version=2.12.1
3336

3437
# external modules, used internally (not shipped)
35-
partest.version.number=1.0.6
36-
scalacheck.version.number=1.11.4
38+
partest.version.number=1.0.7
39+
scalacheck.version.number=1.12.2
3740

3841
# TODO: modularize the compiler
3942
#scala-compiler-doc.version.number=1.0.0-RC1

0 commit comments

Comments
 (0)