From 19d75ae2f9f0959e1f230d8d834dd39f827a5d83 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sat, 1 Jun 2013 10:56:30 -0400 Subject: [PATCH] preparation for 0.13.0-Beta1 --- CONTRIBUTING.md | 10 +++++----- project/Sbt.scala | 2 +- project/Util.scala | 2 +- project/build.properties | 2 +- src/main/conscript/sbt/launchconfig | 2 +- src/main/conscript/scalas/launchconfig | 2 +- src/main/conscript/screpl/launchconfig | 2 +- src/sphinx/conf.py | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 20e21ea7d..67bb965cb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,11 +35,11 @@ See below for details on getting sbt sources and modifying the documentation. $ git clone git://github.com/sbt/sbt.git $ cd sbt -3. The initial branch is the development branch 0.13, which contains the latest code for the next major sbt release. To build a specific release or commit, switch to the associated tag. The tag for the latest stable release is v0.12.2: +3. The initial branch is the development branch 0.13, which contains the latest code for the next major sbt release. To build a specific release or commit, switch to the associated tag. The tag for the latest stable release is v0.12.3: - $ git checkout v0.12.2 + $ git checkout v0.12.3 - Note that sbt is always built with the previous stable release. For example, the 0.13 branch is built with 0.12.2, the v0.11.2 tag is built with 0.11.1, and the v0.11.0 tag is built with 0.10.1. + Note that sbt is always built with the previous stable release. For example, the 0.13 branch is built with 0.12.4-RC1, the v0.11.2 tag is built with 0.11.1, and the v0.11.0 tag is built with 0.10.1. 4. To build the launcher, publish all components locally, and build documentation: @@ -49,9 +49,9 @@ See below for details on getting sbt sources and modifying the documentation. $ sbt publish-local proguard sxr doc sphinx:mappings -5. To use this locally built version of sbt, copy your stable `~/bin/sbt` script to `~/bin/xsbt` and change it to use the launcher jar in `/target/`. For the v0.12.2 tag, the full location is: +5. To use this locally built version of sbt, copy your stable `~/bin/sbt` script to `~/bin/xsbt` and change it to use the launcher jar in `/target/`. For the v0.12.3 tag, the full location is: - /target/sbt-launch-0.12.2.jar + /target/sbt-launch-0.12.3.jar If using the 0.13 development branch, the launcher is at: diff --git a/project/Sbt.scala b/project/Sbt.scala index 098506b01..669c936f7 100644 --- a/project/Sbt.scala +++ b/project/Sbt.scala @@ -14,7 +14,7 @@ object Sbt extends Build override lazy val settings = super.settings ++ buildSettings ++ Status.settings def buildSettings = Seq( organization := "org.scala-sbt", - version := "0.13.0-SNAPSHOT", + version := "0.13.0-Beta1", publishArtifact in packageDoc := false, scalaVersion := "2.10.2-RC2", publishMavenStyle := false, diff --git a/project/Util.scala b/project/Util.scala index 4b62e266d..230deff20 100644 --- a/project/Util.scala +++ b/project/Util.scala @@ -155,7 +155,7 @@ object %s { object Common { def lib(m: ModuleID) = libraryDependencies += m - lazy val jlineDep = "jline" % "jline" % "2.10" + lazy val jlineDep = "jline" % "jline" % "2.11" lazy val jansiDep = "org.fusesource.jansi" % "jansi" % "1.9" // jline pom doesn't explicitly declare it? lazy val jline = Seq(lib(jlineDep), lib(jansiDep)) lazy val ivy = lib("org.apache.ivy" % "ivy" % "2.3.0-rc1") diff --git a/project/build.properties b/project/build.properties index 66ad72ce2..1ced03cad 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.12.2 +sbt.version=0.12.4-RC1 diff --git a/src/main/conscript/sbt/launchconfig b/src/main/conscript/sbt/launchconfig index bbc2db5f3..124593198 100644 --- a/src/main/conscript/sbt/launchconfig +++ b/src/main/conscript/sbt/launchconfig @@ -4,7 +4,7 @@ [app] org: org.scala-sbt name: sbt - version: read(sbt.version)[0.13.0-M2] + version: read(sbt.version)[0.13.0-Beta1] class: ${sbt.main.class-sbt.xMain} components: xsbti cross-versioned: true diff --git a/src/main/conscript/scalas/launchconfig b/src/main/conscript/scalas/launchconfig index 001d10bad..2ff10199e 100644 --- a/src/main/conscript/scalas/launchconfig +++ b/src/main/conscript/scalas/launchconfig @@ -4,7 +4,7 @@ [app] org: org.scala-sbt name: sbt - version: 0.13.0-M2 + version: 0.13.0-Beta1 class: sbt.ScriptMain components: xsbti cross-versioned: true diff --git a/src/main/conscript/screpl/launchconfig b/src/main/conscript/screpl/launchconfig index 586bc1b8b..12b4b0ffc 100644 --- a/src/main/conscript/screpl/launchconfig +++ b/src/main/conscript/screpl/launchconfig @@ -4,7 +4,7 @@ [app] org: org.scala-sbt name: sbt - version: 0.13.0-M2 + version: 0.13.0-Beta1 class: sbt.ConsoleMain components: xsbti cross-versioned: true diff --git a/src/sphinx/conf.py b/src/sphinx/conf.py index 133e68fe4..a7e92fc7f 100644 --- a/src/sphinx/conf.py +++ b/src/sphinx/conf.py @@ -9,9 +9,9 @@ extensions = ['sphinxcontrib.issuetracker', 'sphinx.ext.extlinks', 'howto'] project = 'sbt' version = '0.13' -release = '0.13.0-SNAPSHOT' +release = '0.13.0' scalaVersion = "2.10" -scalaRelease = "2.10.1" +scalaRelease = "2.10.2" # General settings