Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

0.13.1

  • Loading branch information...
commit 48fb98f2d1dec3c16f064dd15d56a1178ddb77b7 1 parent 9014398
@harrah harrah authored
Showing with 12 additions and 12 deletions.
  1. +7 −7 CONTRIBUTING.md
  2. +4 −4 project/Sbt.scala
  3. +1 −1  project/build.properties
View
14 CONTRIBUTING.md
@@ -38,11 +38,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.13.0:
+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.13.1:
- $ git checkout v0.13.0
+ $ git checkout v0.13.1
- Note that sbt is always built with the previous stable release. For example, the 0.13 branch is built with 0.13.0 and the v0.13.0 tag is built with 0.12.4.
+ Note that sbt is always built with the previous stable release. For example, the 0.13 branch is built with 0.13.1 and the v0.13.1 tag is built with 0.13.0.
4. To build the launcher and publish all components locally,
@@ -55,13 +55,13 @@ See below for details on getting sbt sources and modifying the documentation.
> sphinx:mappings
> sxr
-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 `<sbt>/target/`. For the v0.13.0 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 `<sbt>/target/`. For the v0.13.1 tag, the full location is:
- <sbt>/target/sbt-launch-0.13.0.jar
+ <sbt>/target/sbt-launch-0.13.1.jar
If using the 0.13 development branch, the launcher is at:
- <sbt>/target/sbt-launch-0.13.1-SNAPSHOT.jar
+ <sbt>/target/sbt-launch-0.13.2-SNAPSHOT.jar
## Modifying sbt
@@ -71,7 +71,7 @@ See below for details on getting sbt sources and modifying the documentation.
3. After each `publishLocal`, 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.
-4. If a project has `project/build.properties` defined, either delete the file or change `sbt.version` to `0.13.1-SNAPSHOT`.
+4. If a project has `project/build.properties` defined, either delete the file or change `sbt.version` to `0.13.2-SNAPSHOT`.
## Building Documentation
View
8 project/Sbt.scala
@@ -14,7 +14,7 @@ object Sbt extends Build
override lazy val settings = super.settings ++ buildSettings ++ Status.settings ++ nightlySettings
def buildSettings = Seq(
organization := "org.scala-sbt",
- version := "0.13.1-SNAPSHOT",
+ version := "0.13.2-SNAPSHOT",
publishArtifact in packageDoc := false,
scalaVersion := "2.10.3",
publishMavenStyle := false,
@@ -42,7 +42,7 @@ object Sbt extends Build
lazy val testSamples = noPublish( baseProject(launchPath / "test-sample", "Launch Test") ) dependsOn(interfaceSub, launchInterfaceSub) settings(scalaCompiler)
// defines Java structures used across Scala versions, such as the API structures and relationships extracted by
- // the analysis compiler phases and passed back to sbt. The API structures are defined in a simple
+ // the analysis compiler phases and passed back to sbt. The API structures are defined in a simple
// format from which Java sources are generated by the datatype generator subproject
lazy val interfaceSub = minProject(file("interface"), "Interface") settings(interfaceSettings : _*)
@@ -107,7 +107,7 @@ object Sbt extends Build
// Persists the incremental data structures using SBinary
lazy val compilePersistSub = baseProject(compilePath / "persist", "Persist") dependsOn(compileIncrementalSub, apiSub) settings(sbinary)
// sbt-side interface to compiler. Calls compiler-side interface reflectively
- lazy val compilerSub = testedBaseProject(compilePath, "Compile") dependsOn(launchInterfaceSub, interfaceSub % "compile;test->test", logSub, ioSub, classpathSub,
+ lazy val compilerSub = testedBaseProject(compilePath, "Compile") dependsOn(launchInterfaceSub, interfaceSub % "compile;test->test", logSub, ioSub, classpathSub,
logSub % "test->test", launchSub % "test->test", apiSub % "test") settings( compilerSettings : _*)
lazy val compilerIntegrationSub = baseProject(compilePath / "integration", "Compiler Integration") dependsOn(
compileIncrementalSub, compilerSub, compilePersistSub, apiSub, classfileSub)
@@ -211,7 +211,7 @@ object Sbt extends Build
import Sxr.sxr
def releaseSettings = Release.settings(nonRoots, proguard in Proguard)
- def rootSettings = releaseSettings ++ fullDocSettings ++ LaunchProguard.settings ++ LaunchProguard.specific(launchSub) ++
+ def rootSettings = releaseSettings ++ fullDocSettings ++ LaunchProguard.settings ++ LaunchProguard.specific(launchSub) ++
Util.publishPomSettings ++ otherRootSettings ++ proguardedLauncherSettings ++
Transform.conscriptSettings(launchSub)
def otherRootSettings = Seq(
View
2  project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.0
+sbt.version=0.13.1
Please sign in to comment.
Something went wrong with that request. Please try again.