luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Upgrade to 0.13.9.
This commit is contained in:
eugene yokota 2015-08-20 11:51:52 -04:00
parent 3e33ffd5c0 553dffec39
commit 5a7a1db24b
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -118,7 +118,7 @@ Build from source
$ git checkout v0.13.9 $ 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, 4. To build the launcher and publish all components locally,

25
build.sbt
View File

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

2
project/build.properties
View File

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