merge changes for 0.11.0

.gitignore

@@ -1,2 +1,3 @@
 target/
 project/boot/
+.release.sbt

README.md

@@ -1,5 +1,6 @@
 [Google Code]: http://code.google.com/p/simple-build-tool
 [Northeast Scala Symposium]: http://www.nescala.org/2011/
+[Scala Days 2011]: http://days2011.scala-lang.org/node/138/285
 [documentation]: https://github.com/harrah/xsbt/wiki
 [Setup]: https://github.com/harrah/xsbt/wiki/Setup
 [video of a demo]: http://vimeo.com/20263617
@@ -8,9 +9,9 @@
 
 This is the 0.11.x series of sbt.  See [Setup] for getting started with the latest binary release or see below to build from source.
 
-The previous stable release of sbt was 0.7.7, which was hosted on [Google Code].
+sbt 0.7.7 and earlier versions are hosted on [Google Code].
 
-There is a [video of a demo] given at the [Northeast Scala Symposium] that gives a brief introduction to the concepts in sbt 0.9 and later.  Note that the demo was based on 0.9.0 and things have changed since then.  See the [documentation] for current information.
+There is a [video of a demo] given at Scala Days 2011] based on sbt 0.10.0 that gives an introduction to the configuration system in sbt 0.10.0 and later.  See the [documentation] for current information.
 
 # Build from source
 
@@ -20,9 +21,9 @@ There is a [video of a demo] given at the [Northeast Scala Symposium] that gives
 		$ git clone git://github.com/harrah/xsbt.git
 		$ cd xsbt
 
-3. The initial branch is the development branch 0.11, which contains the latest code for the 0.11.x series.  To build a specific release or commit, switch to the associated tag.  The tag for the latest stable release is v0.10.1:
+3. The initial branch is the development branch 0.11, which contains the latest code for the 0.11.x series.  To build a specific release or commit, switch to the associated tag.  The tag for the latest stable release is v0.11.0:
 
-		$ git checkout v0.10.1
+		$ git checkout v0.11.0
 
 4. To build the launcher, publish all components locally, and build API and SXR documentation:
 
@@ -32,13 +33,13 @@ There is a [video of a demo] given at the [Northeast Scala Symposium] that gives
 
 		$ sbt publish-local proguard sxr doc
 
-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 `<xsbt>/target/`.  For the v0.10.1 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 `<xsbt>/target/`.  For the v0.11.0 tag, the full location is:
 
-		<xsbt>/target/sbt-launch-0.10.1.jar
+		<xsbt>/target/sbt-launch-0.11.0.jar
 
 	If using the 0.11 development branch, the launcher is at:
 
-		<xsbt>/target/sbt-launch-0.11.0-SNAPSHOT.jar
+		<xsbt>/target/sbt-launch-0.11.1-SNAPSHOT.jar
 
 ## Modifying sbt
 
@@ -48,4 +49,4 @@ To use your modified version of sbt in a project locally, run `publish-local`.
 
 After each `publish-local`, clean the `project/boot/` directory in the project in which you want to use the locally built sbt.  Alternatively, if sbt is running and the launcher hasn't changed, run `reboot full` to have sbt do this for you.
 
-If a project has `project/build.properties` defined, either delete the file or change `sbt.version` to `0.11.0-SNAPSHOT`.
+If a project has `project/build.properties` defined, either delete the file or change `sbt.version` to `0.11.1-SNAPSHOT`.

project/Release.scala

@@ -121,7 +121,7 @@ Before running full-release, the following should be done manually from the root
 3. 'scripted'
 4. Set the release version in README, build definition, and in src/main/conscript configurations.
 5. Run 'show updated-wiki-repository'.  Update versions, documentation for release in displayed directory.
-6. Add notes/<version>.markdown (pending)
-7. 'preview-notes' (pending)
+6. Add notes/<version>.markdown
+7. 'preview-notes'
 """
 }

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-tools.sbt",
-		version := "0.11.0-SNAPSHOT",
+		version := "0.11.1-SNAPSHOT",
 		publishArtifact in packageDoc := false,
 		scalaVersion := "2.9.1",
 		publishMavenStyle := false,

sbt/notes/0.11.0.markdown

@@ -0,0 +1,31 @@
+Major Improvements:
+
+* Move to 2.9.1 for project definitions and plugins
+* Drop support for 2.7
+* Settings overhaul, mainly to make API documentation more usable
+* Support using native libraries in `run` and `test` (but not `console`, for example)
+* Automatic plugin cross-versioning.  Use
+
+	    addSbtPlugin("group" % "name" % "version")
+
+    in `project/plugins.sbt` instead of `libraryDependencies += ...`   See [Plugins](https://github.com/harrah/xsbt/wiki/Plugins) for details
+
+
+Fixes and Improvements:
+
+ * Display all undefined settings at once, instead of only the first one
+ * Deprecate separate `classpathFilter`, `defaultExcludes`, and `sourceFilter` keys in favor of `includeFilter` and `excludeFilter` explicitly scoped by `unmanagedSources`, `unmanagedResources`, or `unmanagedJars` as appropriate (Indrajit)
+ * Default to using shared boot directory in `~/.sbt/boot/`
+ * Can put contents of `project/plugins/` directly in `project/` instead.  Will likely deprecate `plugins/` directory
+ * Key display is context sensitive.  For example, in a single project, the build and project axes will not be displayed
+ * [#114](https://github.com/harrah/xsbt/issues/114), [#118](https://github.com/harrah/xsbt/issues/118), [#121](https://github.com/harrah/xsbt/issues/121), [#132](https://github.com/harrah/xsbt/issues/132), [#135](https://github.com/harrah/xsbt/issues/135), [#157](https://github.com/harrah/xsbt/issues/157): Various settings and error message improvements
+ * [#115](https://github.com/harrah/xsbt/issues/115): Support configuring checksums separately for `publish` and `update`
+ * [#118](https://github.com/harrah/xsbt/issues/118): Add `about` command
+ * [#118](https://github.com/harrah/xsbt/issues/118), [#131](https://github.com/harrah/xsbt/issues/131): Improve `last` command.  Aggregate `last <task>` and display all recent output for `last`
+ * [#120](https://github.com/harrah/xsbt/issues/120): Support read-only external file projects (Fred)
+ * [#128](https://github.com/harrah/xsbt/issues/128): Add `skip` setting to override recompilation change detection
+ * [#139](https://github.com/harrah/xsbt/issues/139): Improvements to pom generation (Indrajit)
+ * [#140](https://github.com/harrah/xsbt/issues/140), [#145](https://github.com/harrah/xsbt/issues/145): Add standard manifest attributes to binary and source jars (Indrajit)
+ * Allow sources used for `doc` generation to be different from sources for `compile`
+ * [#156](https://github.com/harrah/xsbt/issues/156): Made `package` an alias for `package-bin`
+ * [#162](https://github.com/harrah/xsbt/issues/162): handling of optional dependencies in pom generation

sbt/notes/about.markdown

@@ -1 +1 @@
-[sbt](https://github.com/harrah/xsbt) is a Scala build tool.
+[sbt](https://github.com/harrah/xsbt/wiki) is a Scala build tool.

src/main/conscript/sbt/launchconfig

@@ -4,7 +4,7 @@
 [app]
   org: org.scala-tools.sbt
   name: sbt
-  version: read(sbt.version)[0.11.0-RC0]
+  version: read(sbt.version)[0.11.0]
   class: ${sbt.main.class-sbt.xMain}
   components: xsbti
   cross-versioned: true

src/main/conscript/scalas/launchconfig

@@ -4,7 +4,7 @@
 [app]
   org: org.scala-tools.sbt
   name: sbt
-  version: 0.11.0-RC0
+  version: 0.11.0
   class: sbt.ScriptMain
   components: xsbti
   cross-versioned: true

src/main/conscript/screpl/launchconfig

@@ -4,7 +4,7 @@
 [app]
   org: org.scala-tools.sbt
   name: sbt
-  version: 0.11.0-RC0
+  version: 0.11.0
   class: sbt.ConsoleMain
   components: xsbti
   cross-versioned: true