diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2017-04-10 11:04:04 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan@lightbend.com> | 2017-04-10 11:04:04 -0700 |
| commit | a3987d86ef64387decc277bdaa2fa48b68f07025 (patch) | |
| tree | 181b23e9bb6f99b4eb89e048d185d984a16c7fc9 | |
| parent | 7fa382355493354292fe5356bb4e6c72f56f43b9 (diff) | |
| download | scala-a3987d86ef64387decc277bdaa2fa48b68f07025.tar.gz scala-a3987d86ef64387decc277bdaa2fa48b68f07025.tar.bz2 scala-a3987d86ef64387decc277bdaa2fa48b68f07025.zip | |
Bump on 2.11.10 release
| -rw-r--r-- | build.number | 2 | ||||
| -rw-r--r-- | build.sbt | 2 | ||||
| -rwxr-xr-x | scripts/jobs/integrate/windows | 2 | ||||
| -rw-r--r-- | test/benchmarks/build.sbt | 2 | ||||
| -rw-r--r-- | versions.properties | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/build.number b/build.number index eb7a952b15..6c222a08f6 100644 --- a/build.number +++ b/build.number @@ -4,7 +4,7 @@ version.major=2 version.minor=11 -version.patch=10 +version.patch=11 # This is the -N part of a version (2.9.1-1). If it's 0, it's dropped from maven versions. It should not be used again. version.bnum=0 @@ -113,7 +113,7 @@ lazy val publishSettings : Seq[Setting[_]] = Seq( // VersionUtil.versionPropertiesImpl for details. The standard sbt `version` setting should not be set directly. It // is the same as the Maven version and derived automatically from `baseVersion` and `baseVersionSuffix`. globalVersionSettings -baseVersion in Global := "2.11.10" +baseVersion in Global := "2.11.11" baseVersionSuffix in Global := "SNAPSHOT" mimaReferenceVersion in Global := Some("2.11.0") diff --git a/scripts/jobs/integrate/windows b/scripts/jobs/integrate/windows index 83caaaa676..baed9f6236 100755 --- a/scripts/jobs/integrate/windows +++ b/scripts/jobs/integrate/windows @@ -12,7 +12,7 @@ javac -version ant -version ant \ - -Dstarr.version=2.11.9 \ + -Dstarr.version=2.11.10 \ -Dscalac.args.optimise=-optimise \ -Dlocker.skip=1 \ test diff --git a/test/benchmarks/build.sbt b/test/benchmarks/build.sbt index 7ffa4a4346..f80305f24b 100644 --- a/test/benchmarks/build.sbt +++ b/test/benchmarks/build.sbt @@ -1,5 +1,5 @@ scalaHome := Some(file("../../build/pack")) -scalaVersion := "2.11.9" +scalaVersion := "2.11.10" scalacOptions ++= Seq("-feature", "-Yopt:l:classpath") lazy val root = (project in file(".")). diff --git a/versions.properties b/versions.properties index 55420f6c3f..4318bfa6e3 100644 --- a/versions.properties +++ b/versions.properties @@ -8,7 +8,7 @@ # 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). -starr.version=2.11.9 +starr.version=2.11.10 # These are the versions of the modules that go with this release. # These properties are used during PR validation and in dbuild builds. @@ -22,7 +22,7 @@ starr.version=2.11.9 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.9 +scala.full.version=2.11.10 # external modules shipped with distribution, as specified by scala-library-all's pom scala-xml.version.number=1.0.5 |