Merge pull request #2166 from dwijnand/upgrade-to-0.13.9

Upgrade to 0.13.9.

CONTRIBUTING.md

@@ -118,7 +118,7 @@ Build from source
 
 		$ git checkout v0.13.9
 
-	Note that sbt is always built with the previous stable release.  For example, the [0.13](https://github.com/sbt/sbt/tree/0.13) branch is built with 0.13.8 and the [v0.13.8](https://github.com/sbt/sbt/tree/v0.13.8) tag is built with 0.13.8.
+	Note that sbt is always built with the previous stable release.  For example, the [0.13](https://github.com/sbt/sbt/tree/0.13) branch is built with 0.13.9 and the [v0.13.9](https://github.com/sbt/sbt/tree/v0.13.9) tag is built with 0.13.8.
 
 4. To build the launcher and publish all components locally,
 

build.sbt

@@ -1,27 +1,18 @@
-import Project.Initialize
 import Util._
 import Dependencies._
-import Licensed._
-import Scope.ThisScope
 import Scripted._
-import StringUtilities.normalize
 import Sxr.sxr
 
 // ThisBuild settings take lower precedence,
 // but can be shared across the multi projects.
-def buildLevelSettings: Seq[Setting[_]] = Seq(
-  organization in ThisBuild := "org.scala-sbt",
-  version in ThisBuild := "0.13.10-SNAPSHOT",
-  // bintrayOrganization in ThisBuild := None,
-  // bintrayRepository in ThisBuild := "test-test-test",
-  bintrayOrganization in ThisBuild :=  {
-    if ((publishStatus in ThisBuild).value == "releases") Some("typesafe")
-    else Some("sbt")
-  },
-  bintrayRepository in ThisBuild := s"ivy-${(publishStatus in ThisBuild).value}",
-  bintrayPackage in ThisBuild := "sbt",
-  bintrayReleaseOnPublish in ThisBuild := false
-)
+def buildLevelSettings: Seq[Setting[_]] = inThisBuild(Seq(
+  organization := "org.scala-sbt",
+  version := "0.13.10-SNAPSHOT",
+  bintrayOrganization := Some(if (publishStatus.value == "releases") "typesafe" else "sbt"),
+  bintrayRepository := s"ivy-${publishStatus.value}",
+  bintrayPackage := "sbt",
+  bintrayReleaseOnPublish := false
+))
 
 def commonSettings: Seq[Setting[_]] = Seq(
   scalaVersion := scala210,

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=0.13.9