From 56d8432682e3d828c1a72689521e654d9e8e275b Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 13 Apr 2012 18:33:00 -0400 Subject: [PATCH] 0.13 branch for new development --- README.md | 14 ++++++++------ project/Sbt.scala | 2 +- src/main/conscript/sbt/launchconfig | 2 +- src/main/conscript/scalas/launchconfig | 2 +- src/main/conscript/screpl/launchconfig | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index efeee8c0f..e7ae44604 100644 --- a/README.md +++ b/README.md @@ -41,16 +41,18 @@ This is the 0.11.x series of sbt (soon to be 0.12.x). /target/sbt-launch-0.12.0-M2.jar - If using the 0.12 development branch, the launcher is at: + If using the 0.13 development branch, the launcher is at: - /target/sbt-launch-0.12.0-SNAPSHOT.jar + /target/sbt-launch-0.13.0-SNAPSHOT.jar ## Modifying sbt -When developing sbt itself, there is no need to run `build-all`, since this generates documentation as well. For the fastest turnaround time for checking compilation only, run `compile`. +1. New development takes place on the 0.13 branch. Fixes and improvements that are binary compatible with 0.12.0 can be get backported to the 0.12 branch. -To use your modified version of sbt in a project locally, run `publish-local`. If you have modified the launcher, also run `proguard`. +2. When developing sbt itself, there is no need to run `build-all`, since this generates documentation as well. For the fastest turnaround time for checking compilation only, run `compile`. -After each `publish-local`, clean the `~/.sbt/boot/` directory. Alternatively, if sbt is running and the launcher hasn't changed, run `reboot full` to have sbt do this for you. +3. To use your modified version of sbt in a project locally, run `publish-local`. If you have modified the launcher, also run `proguard`. -If a project has `project/build.properties` defined, either delete the file or change `sbt.version` to `0.12.0-SNAPSHOT`. +4. After each `publish-local`, clean the `~/.sbt/boot/` directory. Alternatively, if sbt is running and the launcher hasn't changed, run `reboot full` to have sbt do this for you. + +5. If a project has `project/build.properties` defined, either delete the file or change `sbt.version` to `0.13.0-SNAPSHOT`. diff --git a/project/Sbt.scala b/project/Sbt.scala index 1a7297f38..22ac427bd 100644 --- a/project/Sbt.scala +++ b/project/Sbt.scala @@ -15,7 +15,7 @@ object Sbt extends Build override lazy val settings = super.settings ++ buildSettings ++ Status.settings def buildSettings = Seq( organization := "org.scala-sbt", - version := "0.12.0-Beta", + version := "0.13.0-SNAPSHOT", publishArtifact in packageDoc := false, scalaVersion := "2.9.2", publishMavenStyle := false, diff --git a/src/main/conscript/sbt/launchconfig b/src/main/conscript/sbt/launchconfig index e9161a17a..9e5b66eee 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.12.0-Beta] + version: read(sbt.version)[0.13.0-SNAPSHOT] 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 546746f77..aa793bfc0 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.12.0-Beta + version: 0.13.0-SNAPSHOT class: sbt.ScriptMain components: xsbti cross-versioned: true diff --git a/src/main/conscript/screpl/launchconfig b/src/main/conscript/screpl/launchconfig index d3a05eac4..fcc26b1c9 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.12.0-Beta + version: 0.13.0-SNAPSHOT class: sbt.ConsoleMain components: xsbti cross-versioned: true