summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2016-03-09 18:35:09 -0500
committerSeth Tisue <seth@tisue.net>2016-03-09 18:35:09 -0500
commit22b79055a054c0095daf94fe5368042d509a1127 (patch)
treeed1370740dcfa2a691b338df05d1b3065eb7734e /build.sbt
parentbd4926fc01c5854fd1e228ac584fbc57529c2429 (diff)
parentfd7a15973d197d53b9c45dd06cb121372577e3f6 (diff)
downloadscala-22b79055a054c0095daf94fe5368042d509a1127.tar.gz
scala-22b79055a054c0095daf94fe5368042d509a1127.tar.bz2
scala-22b79055a054c0095daf94fe5368042d509a1127.zip
Merge branch '2.11.x' into newer-akka
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt2
1 files changed, 1 insertions, 1 deletions
diff --git a/build.sbt b/build.sbt
index b36f54ba99..4465b662ca 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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.8"
+baseVersion in Global := "2.11.9"
baseVersionSuffix in Global := "SNAPSHOT"
lazy val commonSettings = clearSourceAndResourceDirectories ++ publishSettings ++ Seq[Setting[_]](