Skip to content

Commit 1ae6fc0

Browse files
committed
Merge branch '2.11.x' into scala-xml-version-bump
2 parents 76f633c + fd7a159 commit 1ae6fc0

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

build.number

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
version.major=2
66
version.minor=11
7-
version.patch=8
7+
version.patch=9
88

99
# 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.
1010
version.bnum=0

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ lazy val publishSettings : Seq[Setting[_]] = Seq(
113113
// VersionUtil.versionPropertiesImpl for details. The standard sbt `version` setting should not be set directly. It
114114
// is the same as the Maven version and derived automatically from `baseVersion` and `baseVersionSuffix`.
115115
globalVersionSettings
116-
baseVersion in Global := "2.11.8"
116+
baseVersion in Global := "2.11.9"
117117
baseVersionSuffix in Global := "SNAPSHOT"
118118

119119
lazy val commonSettings = clearSourceAndResourceDirectories ++ publishSettings ++ Seq[Setting[_]](

scripts/jobs/integrate/windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export ANT_OPTS="-Dfile.encoding=UTF-8 -server -XX:+AggressiveOpts -XX:+UseParNe
99
PATH=/cygdrive/c/apache-ant-1.9.6/bin:$PATH
1010

1111
ant \
12-
-Dstarr.version=2.11.7 \
12+
-Dstarr.version=2.11.8 \
1313
-Dscalac.args.optimise=-optimise \
1414
-Dlocker.skip=1 \
1515
test

versions.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# The scala version used for bootstrapping. This has no impact on the final classfiles:
99
# there are two stages (locker and quick), so compiler and library are always built
1010
# with themselves. Stability is ensured by building a third stage (strap).
11-
starr.version=2.11.7
11+
starr.version=2.11.8
1212

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.
@@ -22,7 +22,7 @@ starr.version=2.11.7
2222
scala.binary.version=2.11
2323
# e.g. 2.11.0-RC1, 2.11.0, 2.11.1-RC1, 2.11.1
2424
# this defines the dependency on scala-continuations-plugin in scala-dist's pom
25-
scala.full.version=2.11.7
25+
scala.full.version=2.11.8
2626

2727
# external modules shipped with distribution, as specified by scala-library-all's pom
2828
scala-xml.version.number=1.0.5

0 commit comments

Comments
 (0)