diff options
-rwxr-xr-x | scripts/jobs/integrate/bootstrap | 20 | ||||
-rw-r--r-- | versions.properties | 6 |
2 files changed, 14 insertions, 12 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index bb2beeb53c..56e23a51b4 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -59,15 +59,17 @@ # (*) https://github.com/sbt/sbt/blob/0.13.8/util/cross/src/main/input_sources/CrossVersionUtil.scala#L39 -# Binary incompatible changes in Modules: example with Scala 2.11 / 2.12 and scala-xml -# - Simple case: Scala 2.11 and 2.12 use the same scala-xml version, for example v1.0.3 -# - Only one branch in the module repostiory. This branch is cross-built against 2.11 and 2.12. -# - This set-up does not allow incompatible changes in scala-xml for Scala 2.12. -# - General case: The scala-xml authors want to introduce incompatible changes for 2.12 -# - The scala-xml minor version needs to be increased, so 2.12 would depend on scala-xml v1.1.x (or maybe v2.0.x) -# - The repostiory for scala-xml would have separate branches for each minor version (1.0.x, 1.1.x) -# - This allows building new (binary compatible) versions that target Scala 2.11 -# - The Scala release script would require some work, it is currently not prepared to handle branches in module repositories +# Binary incompatible changes in Modules: example with Scala 2.11 / 2.12 and scala-parser-combinators +# - The 1.0.x branch on scala-parser-combinators remains binary compatible with 1.0.0 +# - Scala 2.11 will always use 1.0.x releases: we ship scala-parser-combinators with the distribution, +# so we cannot introduce incompatible changes in a minor release. +# - The master branch of scala-parser-combinators contains binary incompatible changes, versioned 1.1.x +# - Scala 2.12 will use 1.1.x releases +# - No changes to the build script required: just put the 1.1.x version number into versions.properties +# +# Note: It's still OK for a module to release a binary incompatible version to maven, for example +# scala-parser-combinators_2.11 % 1.1.0. Users can depend on this in their sbt build. But for the +# distribution (tar/zip archives, scala-library-all) we have to stay on the binary compatible version. # Requirements diff --git a/versions.properties b/versions.properties index 2d7132769e..bf89804d5d 100644 --- a/versions.properties +++ b/versions.properties @@ -1,4 +1,4 @@ -#Tue, 20 May 2014 10:01:37 +0200 +#Fri, 01 May 2015 16:27:16 +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, @@ -8,7 +8,7 @@ # 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.version=2.12.0-M1 # These are the versions of the modules that go with this release. # These properties are used during PR validation and in dbuild builds. @@ -19,7 +19,7 @@ starr.version=2.11.6 # - 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 +scala.binary.version=2.12.0-M1 # external modules shipped with distribution, as specified by scala-library-all's pom scala-xml.version.number=1.0.4 |